From 4a62dada2d243f5523ea36186db5c0b38dd5b1a4 Mon Sep 17 00:00:00 2001
From: Itamar Oren <itamaro@meta.com>
Date: Sat, 1 Feb 2025 13:05:37 -0800
Subject: [PATCH] ubuntu build and test workarounds

---
 .github/workflows/reusable-ubuntu.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
index 0dbfcabaa87..f057a828133 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -71,6 +71,10 @@ jobs:
     - name: Remount sources writable for tests
       # some tests write to srcdir, lack of pyc files slows down testing
       run: sudo mount $CPYTHON_RO_SRCDIR -oremount,rw
+    - name: Delete init_cinderx from the source tree
+      run: rm Lib/init_cinderx.py
     - name: Tests
       working-directory: ${{ env.CPYTHON_BUILDDIR }}
-      run: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu"
+      # Meta-specific exclusions:
+      # test_email, test_lib2to3: GitHub export messes up EOL style, which interferes with these tests
+      run: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu -x test_email test_lib2to3"