diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index 52f7d0d2b3df95..dd8fbd65430e0a 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -60,7 +60,7 @@ jobs: - i686-pc-windows-msvc/msvc - x86_64-pc-windows-msvc/msvc - aarch64-pc-windows-msvc/msvc - - x86_64-apple-darwin/clang + - x86_64-apple-darwin-rosetta/clang - aarch64-apple-darwin/clang - x86_64-unknown-linux-gnu/gcc - aarch64-unknown-linux-gnu/gcc @@ -79,9 +79,9 @@ jobs: - target: aarch64-pc-windows-msvc/msvc architecture: ARM64 runner: windows-11-arm - - target: x86_64-apple-darwin/clang + - target: x86_64-apple-darwin-rosetta/clang architecture: x86_64 - runner: macos-13 + runner: macos-14 - target: aarch64-apple-darwin/clang architecture: aarch64 runner: macos-14 @@ -122,7 +122,13 @@ jobs: export CFLAGS_JIT='-Werror=unguarded-availability' export MACOSX_DEPLOYMENT_TARGET=10.15 ./configure --enable-experimental-jit --enable-universalsdk --with-universal-archs=universal2 ${{ matrix.debug && '--with-pydebug' || '' }} - make all --jobs 4 + # Use Rosetta for x86_64 builds on ARM runners because of + # the deprecation of x86_64 support for GitHub-hosted macOS runners + if [[ "${{ matrix.architecture }}" == "x86_64" && "$(uname -m)" == "arm64" ]]; then + arch -x86_64 make all --jobs 4 + else + make all --jobs 4 + fi ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 - name: Linux