From ab667ff54080fc37d82fd61d642375f77c029f15 Mon Sep 17 00:00:00 2001 From: Jerry Ma Date: Sun, 12 Oct 2025 22:43:25 +0800 Subject: [PATCH 1/4] Drop macos-13 from actions runner Related: https://github.com/crazywhalecc/static-php-cli/pull/922 --- .github/workflows/build-php-unix.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-php-unix.yml b/.github/workflows/build-php-unix.yml index 6803de7..aa9e58b 100644 --- a/.github/workflows/build-php-unix.yml +++ b/.github/workflows/build-php-unix.yml @@ -19,9 +19,9 @@ jobs: - "8.4" runner: - "ubuntu-latest" - - "macos-13" + - "macos-15-intel" - "ubuntu-24.04-arm" - - "macos-14" + - "macos-15" - "ubuntu-22.04" - "ubuntu-22.04-arm" combination: @@ -32,8 +32,8 @@ jobs: exclude: - { runner: "ubuntu-latest", combination: "gnu-bulk" } - { runner: "ubuntu-24.04-arm", combination: "gnu-bulk" } - - { runner: "macos-13", combination: "gnu-bulk" } - - { runner: "macos-14", combination: "gnu-bulk" } + - { runner: "macos-15-intel", combination: "gnu-bulk" } + - { runner: "macos-15", combination: "gnu-bulk" } - { runner: "ubuntu-22.04", combination: "minimal" } - { runner: "ubuntu-22.04", combination: "bulk" } - { runner: "ubuntu-22.04", combination: "common" } @@ -85,12 +85,12 @@ jobs: echo "ARCH=x86_64" >> "$GITHUB_OUTPUT" echo "CMD=bin/spc" >> "$GITHUB_OUTPUT" ;; - macos-13) + macos-15-intel) echo "OS=macos" >> "$GITHUB_OUTPUT" echo "ARCH=x86_64" >> "$GITHUB_OUTPUT" echo "CMD=bin/spc" >> "$GITHUB_OUTPUT" ;; - macos-14) + macos-15) echo "OS=macos" >> "$GITHUB_OUTPUT" echo "ARCH=aarch64" >> "$GITHUB_OUTPUT" echo "CMD=bin/spc" >> "$GITHUB_OUTPUT" From b2d12b9fd7ffbbb21717cd635ed1afdd2dfe5579 Mon Sep 17 00:00:00 2001 From: Jerry Ma Date: Sun, 12 Oct 2025 22:44:35 +0800 Subject: [PATCH 2/4] Update ext-matrix-tests-php80.yml https://github.com/crazywhalecc/static-php-cli/pull/922 --- .github/workflows/ext-matrix-tests-php80.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ext-matrix-tests-php80.yml b/.github/workflows/ext-matrix-tests-php80.yml index 3ba5320..e7a30a9 100644 --- a/.github/workflows/ext-matrix-tests-php80.yml +++ b/.github/workflows/ext-matrix-tests-php80.yml @@ -81,9 +81,9 @@ jobs: - "8.0" operating-system: - "ubuntu-latest" - #- "macos-13" + #- "macos-15-intel" #- "debian-arm64-self-hosted" - - "macos-14" + - "macos-15" steps: - name: "Checkout" @@ -95,11 +95,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 From fd24b844fbb096e18c4b66a8f400988cc9a6183e Mon Sep 17 00:00:00 2001 From: Jerry Ma Date: Sun, 12 Oct 2025 22:45:08 +0800 Subject: [PATCH 3/4] Update macOS versions in PHP 8.4 workflow --- .github/workflows/ext-matrix-tests-php84.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ext-matrix-tests-php84.yml b/.github/workflows/ext-matrix-tests-php84.yml index 0381215..28a62a0 100644 --- a/.github/workflows/ext-matrix-tests-php84.yml +++ b/.github/workflows/ext-matrix-tests-php84.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 From a0d76dec3430fb7ade1617da1f6b01b5497b9a71 Mon Sep 17 00:00:00 2001 From: Jerry Ma Date: Sun, 12 Oct 2025 22:46:06 +0800 Subject: [PATCH 4/4] Update macOS runners in pack-libs workflow --- .github/workflows/pack-libs.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pack-libs.yml b/.github/workflows/pack-libs.yml index 7132e00..5335b65 100644 --- a/.github/workflows/pack-libs.yml +++ b/.github/workflows/pack-libs.yml @@ -32,9 +32,9 @@ jobs: - ubuntu-22.04 # x86_64 glibc - ubuntu-24.04-arm # aarch64 musl - ubuntu-22.04-arm # aarch64 glibc - - macos-13 + - macos-15-intel - windows-2022 - - macos-14 + - macos-15 lib: - gmssl - jbig @@ -89,8 +89,8 @@ jobs: - { runner: "windows-2022", lib: "jbig" } - { runner: "windows-2022", lib: "lerc" } - { runner: "windows-2022", lib: "libacl" } - - { runner: "macos-13", lib: "libacl" } - - { runner: "macos-14", lib: "libacl" } + - { runner: "macos-15-intel", lib: "libacl" } + - { runner: "macos-15", lib: "libacl" } fail-fast: false steps: - name: "Process env string" @@ -128,13 +128,13 @@ jobs: echo "CMD=bin/spc" >> "$GITHUB_OUTPUT" echo "SUFFIX=tgz" >> "$GITHUB_OUTPUT" ;; - macos-13) + macos-15-intel) echo "OS=darwin" >> "$GITHUB_OUTPUT" echo "ARCH=x86_64" >> "$GITHUB_OUTPUT" echo "CMD=bin/spc" >> "$GITHUB_OUTPUT" echo "SUFFIX=txz" >> "$GITHUB_OUTPUT" ;; - macos-14) + macos-15) echo "OS=darwin" >> "$GITHUB_OUTPUT" echo "ARCH=aarch64" >> "$GITHUB_OUTPUT" echo "CMD=bin/spc" >> "$GITHUB_OUTPUT"