Skip to content

Commit 3159ea7

Browse files
committed
Remove macos-13 from GitHub Actions
1 parent 23adbf5 commit 3159ea7

File tree

4 files changed

+3
-26
lines changed

4 files changed

+3
-26
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,10 @@ jobs:
202202
strategy:
203203
fail-fast: false
204204
matrix:
205-
# Cirrus and macos-14 are M1, macos-13 is default GHA Intel.
206-
# macOS 13 only runs tests against the GIL-enabled CPython.
207205
# Cirrus used for upstream, macos-14 for forks.
208206
os:
209207
- ghcr.io/cirruslabs/macos-runner:sonoma
210208
- macos-14
211-
- macos-13
212209
is-fork: # only used for the exclusion trick
213210
- ${{ github.repository_owner != 'python' }}
214211
free-threading:
@@ -219,8 +216,6 @@ jobs:
219216
is-fork: true
220217
- os: macos-14
221218
is-fork: false
222-
- os: macos-13
223-
free-threading: true
224219
uses: ./.github/workflows/reusable-macos.yml
225220
with:
226221
config_hash: ${{ needs.build-context.outputs.config-hash }}

.github/workflows/jit.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ 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
6463
- aarch64-apple-darwin/clang
6564
- x86_64-unknown-linux-gnu/gcc
6665
- aarch64-unknown-linux-gnu/gcc
@@ -79,9 +78,6 @@ jobs:
7978
- target: aarch64-pc-windows-msvc/msvc
8079
architecture: ARM64
8180
runner: windows-11-arm
82-
- target: x86_64-apple-darwin/clang
83-
architecture: x86_64
84-
runner: macos-13
8581
- target: aarch64-apple-darwin/clang
8682
architecture: aarch64
8783
runner: macos-14
@@ -106,15 +102,10 @@ jobs:
106102
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
107103
./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
108104
109-
# The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966.
110-
# This is a bug in the macOS runner image where the pre-installed Python is installed in the same
111-
# directory as the Homebrew Python, which causes the build to fail for macos-13. This line removes
112-
# the symlink to the pre-installed Python so that the Homebrew Python is used instead.
113105
- name: macOS
114106
if: runner.os == 'macOS'
115107
run: |
116108
brew update
117-
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
118109
brew install llvm@${{ matrix.llvm }}
119110
export SDKROOT="$(xcrun --show-sdk-path)"
120111
# Set MACOSX_DEPLOYMENT_TARGET and -Werror=unguarded-availability to

.github/workflows/reusable-macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ jobs:
6060
--prefix=/opt/python-dev \
6161
--with-openssl="$(brew --prefix openssl@3.0)"
6262
- name: Build CPython
63-
if : ${{ inputs.free-threading || inputs.os != 'macos-13' }}
63+
if : ${{ inputs.free-threading }}
6464
run: gmake -j8
6565
- name: Build CPython for compiler warning check
66-
if : ${{ !inputs.free-threading && inputs.os == 'macos-13' }}
66+
if : ${{ !inputs.free-threading }}
6767
run: set -o pipefail; gmake -j8 --output-sync 2>&1 | tee compiler_output_macos.txt
6868
- name: Display build info
6969
run: make pythoninfo
7070
- name: Check compiler warnings
71-
if : ${{ !inputs.free-threading && inputs.os == 'macos-13' }}
71+
if : ${{ !inputs.free-threading }}
7272
run: >-
7373
python3 Tools/build/check_warnings.py
7474
--compiler-output-file-path=compiler_output_macos.txt

.github/workflows/tail-call.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
# - i686-pc-windows-msvc/msvc
4040
- x86_64-pc-windows-msvc/msvc
4141
# - aarch64-pc-windows-msvc/msvc
42-
- x86_64-apple-darwin/clang
4342
- aarch64-apple-darwin/clang
4443
- x86_64-unknown-linux-gnu/gcc
4544
- aarch64-unknown-linux-gnu/gcc
@@ -56,9 +55,6 @@ jobs:
5655
# - target: aarch64-pc-windows-msvc/msvc
5756
# architecture: ARM64
5857
# runner: windows-latest
59-
- target: x86_64-apple-darwin/clang
60-
architecture: x86_64
61-
runner: macos-13
6258
- target: aarch64-apple-darwin/clang
6359
architecture: aarch64
6460
runner: macos-14
@@ -101,17 +97,12 @@ jobs:
10197
set LLVMInstallDir=C:\Program Files\LLVM
10298
./PCbuild/build.bat --tail-call-interp -p ${{ matrix.architecture }}
10399
104-
# The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966.
105-
# This is a bug in the macOS runner image where the pre-installed Python is installed in the same
106-
# directory as the Homebrew Python, which causes the build to fail for macos-13. This line removes
107-
# the symlink to the pre-installed Python so that the Homebrew Python is used instead.
108100
# Note: when a new LLVM is released, the homebrew installation directory changes, so the builds will fail.
109101
# We either need to upgrade LLVM or change the directory being pointed to.
110102
- name: Native macOS (release)
111103
if: runner.os == 'macOS'
112104
run: |
113105
brew update
114-
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
115106
brew install llvm@${{ matrix.llvm }}
116107
export SDKROOT="$(xcrun --show-sdk-path)"
117108
export PATH="/usr/local/opt/llvm/bin:$PATH"

0 commit comments

Comments
 (0)