]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
GH-126464 Fix JIT CI on aarch64-apple-darwin (GH-126494)
authoralm <alonme@users.noreply.github.com>
Thu, 7 Nov 2024 18:55:31 +0000 (20:55 +0200)
committerGitHub <noreply@github.com>
Thu, 7 Nov 2024 18:55:31 +0000 (10:55 -0800)
.github/workflows/jit.yml

index 897c692118e9a4d241ecd56468a222ad50bc700b..35d5d59b7626600f9864a7dab42d4c3781d54729 100644 (file)
@@ -52,7 +52,7 @@ jobs:
           - x86_64-pc-windows-msvc/msvc
           - aarch64-pc-windows-msvc/msvc
           - x86_64-apple-darwin/clang
-          - aarch64-apple-darwin/clang
+          - aarch64-apple-darwin/clang
           - x86_64-unknown-linux-gnu/gcc
           - x86_64-unknown-linux-gnu/clang
           - aarch64-unknown-linux-gnu/gcc
@@ -79,11 +79,10 @@ jobs:
             architecture: x86_64
             runner: macos-13
             compiler: clang
-          # GH-126464: A recent change to either GHA or LLVM broke this job:
-          # - target: aarch64-apple-darwin/clang
-          #   architecture: aarch64
-          #   runner: macos-14
-          #   compiler: clang
+          - target: aarch64-apple-darwin/clang
+            architecture: aarch64
+            runner: macos-14
+            compiler: clang
           - target: x86_64-unknown-linux-gnu/gcc
             architecture: x86_64
             runner: ubuntu-22.04
@@ -132,8 +131,8 @@ jobs:
           brew update
           find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
           brew install llvm@${{ matrix.llvm }}
-          SDKROOT="$(xcrun --show-sdk-path)" \
-            ./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
+          export SDKROOT="$(xcrun --show-sdk-path)"
+          ./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
           make all --jobs 4
           ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3