Skip to content

[3.13] gh-145098: Run Apple Silicon macOS CI on macos-26 (Tahoe) (GH-145099) (GH-146412)#146414

Merged
hugovk merged 3 commits intopython:3.13from
hugovk:backport-ce78904-3.13
Mar 30, 2026
Merged

[3.13] gh-145098: Run Apple Silicon macOS CI on macos-26 (Tahoe) (GH-145099) (GH-146412)#146414
hugovk merged 3 commits intopython:3.13from
hugovk:backport-ce78904-3.13

Conversation

@hugovk
Copy link
Copy Markdown
Member

@hugovk hugovk commented Mar 25, 2026

pythonGH-145099) (pythonGH-146412)

(cherry picked from commit ce78904)

Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com>
@hugovk
Copy link
Copy Markdown
Member Author

hugovk commented Mar 25, 2026

Some JIT failures here, does it need some updates to work with macOS 26?

@vstinner
Copy link
Copy Markdown
Member

JIT build error:

In file included from /Users/runner/work/cpython/cpython/Tools/jit/trampoline.c:1:
/Users/runner/work/cpython/cpython/Include/Python.h:20:10: fatal error: 'assert.h' file not found

This error looks like #126464 which was solved by #126494. It seems like .github/workflows/jit.yml miss this change in the 3.13 branch.

@vstinner
Copy link
Copy Markdown
Member

@hugovk: Can you try this change on your PR?

diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml
index fc019fb0d32..ffd49ca2834 100644
--- a/.github/workflows/jit.yml
+++ b/.github/workflows/jit.yml
@@ -133,8 +133,8 @@ jobs:
         run: |
           brew update
           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
 

@hugovk
Copy link
Copy Markdown
Member Author

hugovk commented Mar 30, 2026

JIT macOS tests are now passing.

JIT aarch64-unknown-linux are consistently failing, but unrelated to these changes they are also on 3.13:

https://github.com/python/cpython/actions/runs/22593670441

And CIFuzz consistently failing, but also unrelated to these changes.

@hugovk hugovk merged commit 0dcb625 into python:3.13 Mar 30, 2026
158 of 173 checks passed
@hugovk hugovk deleted the backport-ce78904-3.13 branch March 30, 2026 13:21
@miss-islington-app
Copy link
Copy Markdown

Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app
Copy link
Copy Markdown

Sorry, @hugovk, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 0dcb625be4410026f53df515282674d7908b005f 3.12

@bedevere-app
Copy link
Copy Markdown

bedevere-app bot commented Mar 30, 2026

GH-146635 is a backport of this pull request to the 3.12 branch.

hugovk added a commit to hugovk/cpython that referenced this pull request Mar 30, 2026
pythonGH-145099) (pythonGH-146412) (pythonGH-146414)

(cherry picked from commit 0dcb625)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com>
@bedevere-app bedevere-app bot removed the needs backport to 3.12 only security fixes label Mar 30, 2026
hugovk added a commit that referenced this pull request Mar 30, 2026
…145099) (GH-146412) (GH-146414) (#146635)

Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com>
hugovk added a commit that referenced this pull request Mar 30, 2026
…145099) (GH-146412) (GH-146414) (GH-146635) (#146638)

Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants