From f28a3cf5a3cfc751aead9ee7738c49b74811a996 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 12 Oct 2025 22:33:22 +0800 Subject: [PATCH 1/2] Drop macos-13 from actions runner --- .github/workflows/build-unix.yml | 4 ++-- .github/workflows/ext-matrix-tests.yml | 8 +++---- .github/workflows/release-build.yml | 6 +++--- src/globals/test-extensions.php | 30 +++++++++++--------------- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-unix.yml b/.github/workflows/build-unix.yml index 16ad76e0..0166bfa0 100644 --- a/.github/workflows/build-unix.yml +++ b/.github/workflows/build-unix.yml @@ -136,12 +136,12 @@ jobs: macos-x86_64) DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download" BUILD_CMD="./bin/spc build" - RUNS_ON="macos-13" + RUNS_ON="macos-15-intel" ;; macos-aarch64) DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download" BUILD_CMD="./bin/spc build" - RUNS_ON="macos-14" + RUNS_ON="macos-15" ;; esac DOWN_CMD="$DOWN_CMD --with-php=${{ inputs.php-version }} --for-extensions=${{ inputs.extensions }} --ignore-cache-sources=php-src" diff --git a/.github/workflows/ext-matrix-tests.yml b/.github/workflows/ext-matrix-tests.yml index 84d3b518..e93e9145 100644 --- a/.github/workflows/ext-matrix-tests.yml +++ b/.github/workflows/ext-matrix-tests.yml @@ -85,9 +85,9 @@ jobs: - "8.4" operating-system: - "ubuntu-latest" - #- "macos-13" + #- "macos-15-intel" #- "debian-arm64-self-hosted" - - "macos-14" + - "macos-15" steps: - name: "Checkout" @@ -99,11 +99,11 @@ jobs: OS="" if [ "${{ matrix.operating-system }}" = "ubuntu-latest" ]; then OS="linux-x86_64" - elif [ "${{ matrix.operating-system }}" = "macos-13" ]; then + elif [ "${{ matrix.operating-system }}" = "macos-15-intel" ]; then OS="macos-x86_64" elif [ "${{ matrix.operating-system }}" = "debian-arm64-self-hosted" ]; then OS="linux-aarch64" - elif [ "${{ matrix.operating-system }}" = "macos-14" ]; then + elif [ "${{ matrix.operating-system }}" = "macos-15" ]; then OS="macos-aarch64" fi echo "OS=$OS" >> $GITHUB_ENV diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 61004bd3..aaeee1ff 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -27,7 +27,7 @@ jobs: os: "ubuntu-latest" filename: "spc-linux-x86_64.tar.gz" - name: "macos-x86_64" - os: "macos-13" + os: "macos-15-intel" filename: "spc-macos-x86_64.tar.gz" - name: "linux-aarch64" os: "ubuntu-latest" @@ -147,11 +147,11 @@ jobs: - name: "linux-x86_64" os: "ubuntu-latest" - name: "macos-x86_64" - os: "macos-13" + os: "macos-15-intel" - name: "linux-aarch64" os: "ubuntu-24.04-arm" - name: "macos-aarch64" - os: "macos-latest" + os: "macos-15" - name: "windows-x64" os: "windows-latest" steps: diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 2bc79f0a..b0fa9807 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -13,29 +13,28 @@ declare(strict_types=1); // test php version (8.1 ~ 8.4 available, multiple for matrix) $test_php_version = [ - // '8.1', - // '8.2', - // '8.3', + '8.1', + '8.2', + '8.3', '8.4', // '8.5', // 'git', ]; -// test os (macos-13, macos-14, macos-15, ubuntu-latest, windows-latest are available) +// test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available) $test_os = [ - // 'macos-13', // bin/spc for x86_64 - 'macos-14', // bin/spc for arm64 + 'macos-15-intel', // bin/spc for x86_64 'macos-15', // bin/spc for arm64 // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64 - 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 + // 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 // 'ubuntu-24.04', // bin/spc for x86_64 - 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64 + // 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64 // 'ubuntu-24.04-arm', // bin/spc for arm64 // 'windows-latest', // .\bin\spc.ps1 ]; // whether enable thread safe -$zts = true; +$zts = false; $no_strip = false; @@ -56,7 +55,7 @@ $extensions = match (PHP_OS_FAMILY) { // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`). $shared_extensions = match (PHP_OS_FAMILY) { - 'Linux' => 'grpc,imagick', + 'Linux' => '', 'Darwin' => '', 'Windows' => '', }; @@ -74,7 +73,7 @@ $with_libs = match (PHP_OS_FAMILY) { // You can use `common`, `bulk`, `minimal` or `none`. // note: combination is only available for *nix platform. Windows must use `none` combination $base_combination = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'none', + 'Linux', 'Darwin' => 'common', 'Windows' => 'none', }; @@ -156,17 +155,14 @@ if ($shared_extensions) { switch ($argv[2] ?? null) { case 'ubuntu-22.04': case 'ubuntu-22.04-arm': + case 'macos-14': + case 'macos-15': + case 'macos-15-intel': $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' '; break; case 'ubuntu-24.04': case 'ubuntu-24.04-arm': break; - case 'macos-13': - case 'macos-14': - case 'macos-15': - $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' '; - $no_strip = true; - break; default: $shared_cmd = ''; break; From 1bac06fe3c2f8889a8f3536a4e5fa2e7dd48fd41 Mon Sep 17 00:00:00 2001 From: Jerry Ma Date: Mon, 13 Oct 2025 08:27:40 +0800 Subject: [PATCH 2/2] Remove more macOS 14 case from shared extensions switch Yeah. Copied by tab. --- src/globals/test-extensions.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index b0fa9807..385bca27 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -155,7 +155,6 @@ if ($shared_extensions) { switch ($argv[2] ?? null) { case 'ubuntu-22.04': case 'ubuntu-22.04-arm': - case 'macos-14': case 'macos-15': case 'macos-15-intel': $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';