Skip to content

Commit 30e800a

Browse files
committed
run x86 builds under rosetta
1 parent a269e69 commit 30e800a

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

.github/workflows/jit.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- i686-pc-windows-msvc/msvc
6161
- x86_64-pc-windows-msvc/msvc
6262
- aarch64-pc-windows-msvc/msvc
63-
- x86_64-apple-darwin/clang
63+
- x86_64-apple-darwin-rosetta/clang
6464
- aarch64-apple-darwin/clang
6565
- x86_64-unknown-linux-gnu/gcc
6666
- aarch64-unknown-linux-gnu/gcc
@@ -79,9 +79,9 @@ jobs:
7979
- target: aarch64-pc-windows-msvc/msvc
8080
architecture: ARM64
8181
runner: windows-11-arm
82-
- target: x86_64-apple-darwin/clang
82+
- target: x86_64-apple-darwin-rosetta/clang
8383
architecture: x86_64
84-
runner: macos-13
84+
runner: macos-14
8585
- target: aarch64-apple-darwin/clang
8686
architecture: aarch64
8787
runner: macos-14
@@ -122,7 +122,13 @@ jobs:
122122
export CFLAGS_JIT='-Werror=unguarded-availability'
123123
export MACOSX_DEPLOYMENT_TARGET=10.15
124124
./configure --enable-experimental-jit --enable-universalsdk --with-universal-archs=universal2 ${{ matrix.debug && '--with-pydebug' || '' }}
125-
make all --jobs 4
125+
# Use Rosetta for x86_64 builds on ARM runners because of
126+
# the deprecation of x86_64 support for GitHub-hosted macOS runners
127+
if [[ "${{ matrix.architecture }}" == "x86_64" && "$(uname -m)" == "arm64" ]]; then
128+
arch -x86_64 make all --jobs 4
129+
else
130+
make all --jobs 4
131+
fi
126132
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
127133
128134
- name: Linux

0 commit comments

Comments
 (0)