From bb72219db150f9bfda49ca8a2fc8604d15158106 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 31 Oct 2025 12:47:05 +0100 Subject: [PATCH 1/4] Upgrade from deprecated macos-13 to macos-15-intel in CI Replace GitHub Actions runner image `macos-13` with `macos-15-intel` as recommended in: * https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down > The macOS 13 runner image will be retired by ___December 4th, 2025___. The currently available GitHub Actions macOS runners are: | macOS Version | runner.arch | |---------------|-------------| | macos-13 | X64 | | macos-14 | ARM64 | | macos-15 | ARM64 | | macos-15-intel | X64 | | macos-26 | ARM64 | | macos-latest | ARM64 | --- .ci/build-wheels.sh | 2 +- .ci/build_wheels_osx.sh | 2 +- .github/workflows/pythonapp.yml | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.ci/build-wheels.sh b/.ci/build-wheels.sh index e999bc9..094608b 100755 --- a/.ci/build-wheels.sh +++ b/.ci/build-wheels.sh @@ -57,7 +57,7 @@ make install; make distclean; cd ~/ffmpeg_sources; -curl -kLO "https://cfhcable.dl.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz" +curl -kLO "https://downloads.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz" tar xzf "lame-$LAME_VERSION.tar.gz" cd "lame-$LAME_VERSION" ./configure --prefix="$BUILD_DIR" --enable-nasm --enable-shared; diff --git a/.ci/build_wheels_osx.sh b/.ci/build_wheels_osx.sh index 83bd15e..fddf813 100644 --- a/.ci/build_wheels_osx.sh +++ b/.ci/build_wheels_osx.sh @@ -127,7 +127,7 @@ if [ "$ARCH" = "x86_64" ]; then arg=("--enable-nasm") fi cd "$SRC_PATH"; -curl -kLO "https://cfhcable.dl.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz" +curl -kLO "https://downloads.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz" tar xzf "lame-$LAME_VERSION.tar.gz" cd "lame-$LAME_VERSION" git apply "$base_dir/.ci/libmp3lame-symbols.patch" diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index e9b659b..e45521a 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -170,10 +170,10 @@ jobs: needs: linux_wheels steps: - uses: actions/checkout@v4.2.2 - - name: Set up Python 3.x + - name: Set up Python 3.13 uses: actions/setup-python@v5.4.0 with: - python-version: 3.x + python-version: 3.13 # 3.14 fails! - uses: actions/download-artifact@v4.2.1 with: pattern: py_wheel-* @@ -258,7 +258,7 @@ jobs: twine upload dist/* osx_wheels_create: - runs-on: macos-13 + runs-on: macos-15-intel env: USE_SDL2_MIXER: 0 FFMPEG_BUILD_PATH: "ffmpeg_build" @@ -269,6 +269,7 @@ jobs: DYLD_FALLBACK_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_FALLBACK_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel} strategy: + fail-fast: false matrix: arch: [ "x86_64", "arm64" ] steps: @@ -304,7 +305,7 @@ jobs: path: dist osx_wheels_fuse_test_upload: - runs-on: macos-13 + runs-on: macos-15-intel needs: osx_wheels_create steps: - uses: actions/checkout@v4.2.2 From 6eb748f5cab02304e2c784828735f645d70bba1d Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 1 Nov 2025 17:41:03 +0100 Subject: [PATCH 2/4] Update MACOSX_DEPLOYMENT_TARGET to 11.0 --- .ci/build_wheels_osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/build_wheels_osx.sh b/.ci/build_wheels_osx.sh index fddf813..8c3174f 100644 --- a/.ci/build_wheels_osx.sh +++ b/.ci/build_wheels_osx.sh @@ -14,7 +14,7 @@ export PATH="$BUILD_PATH/bin:/usr/local/bin/:$PATH" export PKG_CONFIG_PATH="$BUILD_PATH/lib/pkgconfig:/usr/lib/pkgconfig/:$PKG_CONFIG_PATH" export CC="/usr/bin/clang" export CXX="/usr/bin/clang" -export MACOSX_DEPLOYMENT_TARGET=10.13 +export MACOSX_DEPLOYMENT_TARGET=11.0 if [ "$ARCH" = "x86_64" ]; then ARCH2=x86_64 From 08f60daba04862db2c53b46a27c9d9fd63d6f3b9 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 1 Nov 2025 17:42:58 +0100 Subject: [PATCH 3/4] Update MACOSX_DEPLOYMENT_TARGET to 11.0 --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index e45521a..da685e3 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -7,7 +7,7 @@ env: SDL_VERSION: "2.26.4" # https://github.com/libsdl-org/SDL/releases SDL_MIXER_VERSION: "2.6.3" # https://github.com/libsdl-org/SDL_mixer/releases USE_SDL2_MIXER: "1" - MACOSX_DEPLOYMENT_TARGET: "10.13" + MACOSX_DEPLOYMENT_TARGET: "11.0" MACOSX_DEPLOYMENT_TARGET_ARM: "11.0" jobs: From c213f3a17edfac9f06b55d9831250453b2e4bbf3 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 2 Nov 2025 11:02:38 +0100 Subject: [PATCH 4/4] Change macOS version for wheels creation Updated macOS version for wheel creation to avoid failures. --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index da685e3..315a8c9 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -258,7 +258,7 @@ jobs: twine upload dist/* osx_wheels_create: - runs-on: macos-15-intel + runs-on: macos-13 # macos-15-intel fails! env: USE_SDL2_MIXER: 0 FFMPEG_BUILD_PATH: "ffmpeg_build"