Skip to content

Commit f28a3cf

Browse files
committed
Drop macos-13 from actions runner
1 parent 6d6a293 commit f28a3cf

File tree

4 files changed

+22
-26
lines changed

4 files changed

+22
-26
lines changed

.github/workflows/build-unix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ jobs:
136136
macos-x86_64)
137137
DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download"
138138
BUILD_CMD="./bin/spc build"
139-
RUNS_ON="macos-13"
139+
RUNS_ON="macos-15-intel"
140140
;;
141141
macos-aarch64)
142142
DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download"
143143
BUILD_CMD="./bin/spc build"
144-
RUNS_ON="macos-14"
144+
RUNS_ON="macos-15"
145145
;;
146146
esac
147147
DOWN_CMD="$DOWN_CMD --with-php=${{ inputs.php-version }} --for-extensions=${{ inputs.extensions }} --ignore-cache-sources=php-src"

.github/workflows/ext-matrix-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ jobs:
8585
- "8.4"
8686
operating-system:
8787
- "ubuntu-latest"
88-
#- "macos-13"
88+
#- "macos-15-intel"
8989
#- "debian-arm64-self-hosted"
90-
- "macos-14"
90+
- "macos-15"
9191

9292
steps:
9393
- name: "Checkout"
@@ -99,11 +99,11 @@ jobs:
9999
OS=""
100100
if [ "${{ matrix.operating-system }}" = "ubuntu-latest" ]; then
101101
OS="linux-x86_64"
102-
elif [ "${{ matrix.operating-system }}" = "macos-13" ]; then
102+
elif [ "${{ matrix.operating-system }}" = "macos-15-intel" ]; then
103103
OS="macos-x86_64"
104104
elif [ "${{ matrix.operating-system }}" = "debian-arm64-self-hosted" ]; then
105105
OS="linux-aarch64"
106-
elif [ "${{ matrix.operating-system }}" = "macos-14" ]; then
106+
elif [ "${{ matrix.operating-system }}" = "macos-15" ]; then
107107
OS="macos-aarch64"
108108
fi
109109
echo "OS=$OS" >> $GITHUB_ENV

.github/workflows/release-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
os: "ubuntu-latest"
2828
filename: "spc-linux-x86_64.tar.gz"
2929
- name: "macos-x86_64"
30-
os: "macos-13"
30+
os: "macos-15-intel"
3131
filename: "spc-macos-x86_64.tar.gz"
3232
- name: "linux-aarch64"
3333
os: "ubuntu-latest"
@@ -147,11 +147,11 @@ jobs:
147147
- name: "linux-x86_64"
148148
os: "ubuntu-latest"
149149
- name: "macos-x86_64"
150-
os: "macos-13"
150+
os: "macos-15-intel"
151151
- name: "linux-aarch64"
152152
os: "ubuntu-24.04-arm"
153153
- name: "macos-aarch64"
154-
os: "macos-latest"
154+
os: "macos-15"
155155
- name: "windows-x64"
156156
os: "windows-latest"
157157
steps:

src/globals/test-extensions.php

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,28 @@
1313

1414
// test php version (8.1 ~ 8.4 available, multiple for matrix)
1515
$test_php_version = [
16-
// '8.1',
17-
// '8.2',
18-
// '8.3',
16+
'8.1',
17+
'8.2',
18+
'8.3',
1919
'8.4',
2020
// '8.5',
2121
// 'git',
2222
];
2323

24-
// test os (macos-13, macos-14, macos-15, ubuntu-latest, windows-latest are available)
24+
// test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
2525
$test_os = [
26-
// 'macos-13', // bin/spc for x86_64
27-
'macos-14', // bin/spc for arm64
26+
'macos-15-intel', // bin/spc for x86_64
2827
'macos-15', // bin/spc for arm64
2928
// 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
30-
'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
29+
// 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
3130
// 'ubuntu-24.04', // bin/spc for x86_64
32-
'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
31+
// 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
3332
// 'ubuntu-24.04-arm', // bin/spc for arm64
3433
// 'windows-latest', // .\bin\spc.ps1
3534
];
3635

3736
// whether enable thread safe
38-
$zts = true;
37+
$zts = false;
3938

4039
$no_strip = false;
4140

@@ -56,7 +55,7 @@
5655

5756
// If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
5857
$shared_extensions = match (PHP_OS_FAMILY) {
59-
'Linux' => 'grpc,imagick',
58+
'Linux' => '',
6059
'Darwin' => '',
6160
'Windows' => '',
6261
};
@@ -74,7 +73,7 @@
7473
// You can use `common`, `bulk`, `minimal` or `none`.
7574
// note: combination is only available for *nix platform. Windows must use `none` combination
7675
$base_combination = match (PHP_OS_FAMILY) {
77-
'Linux', 'Darwin' => 'none',
76+
'Linux', 'Darwin' => 'common',
7877
'Windows' => 'none',
7978
};
8079

@@ -156,17 +155,14 @@ function quote2(string $param): string
156155
switch ($argv[2] ?? null) {
157156
case 'ubuntu-22.04':
158157
case 'ubuntu-22.04-arm':
158+
case 'macos-14':
159+
case 'macos-15':
160+
case 'macos-15-intel':
159161
$shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
160162
break;
161163
case 'ubuntu-24.04':
162164
case 'ubuntu-24.04-arm':
163165
break;
164-
case 'macos-13':
165-
case 'macos-14':
166-
case 'macos-15':
167-
$shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
168-
$no_strip = true;
169-
break;
170166
default:
171167
$shared_cmd = '';
172168
break;

0 commit comments

Comments
 (0)