Skip to content

gh-137638: Use macos-15-intel in GitHub Actions #139154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 3, 2025
+10 −21
Merged

gh-137638: Use macos-15-intel in GitHub Actions #139154

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
30e800a
run x86 builds under rosetta
JacobCoffee Sep 19, 2025
e730b34
Merge branch 'main' into jit-rosetta-x86
JacobCoffee Sep 19, 2025
f77509a
bump to new macos 15 intel runner
JacobCoffee Sep 23, 2025
ad2d480
oopsie
JacobCoffee Sep 23, 2025
a673930
apply code review requests
JacobCoffee Oct 2, 2025
886dc69
Merge branch 'main' into jit-rosetta-x86
JacobCoffee Oct 2, 2025
b181149
try removing find fix
JacobCoffee Oct 2, 2025
b36ac07
Update build.yml
JacobCoffee Oct 2, 2025
46a4d50
Update build.yml
JacobCoffee Oct 2, 2025
a240580
Apply suggestion from @webknjaz
JacobCoffee Oct 3, 2025
9c075fa
Apply suggestions from code review
JacobCoffee Oct 3, 2025
cdd5df9
Merge branch 'main' into jit-rosetta-x86
JacobCoffee Oct 3, 2025
2dce428
Mention other pending issue
hugovk Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/jit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe update arm runners to 15 in a separate follow-up PR (since this one is declared to be about handling intel)

Expand Down Expand Up @@ -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
Expand Down
Loading