Skip to content

Commit 5b792f9

Browse files
committed
remove macos 13 and ubuntu latest (alpine docker on 24.04, gnu docker on 22.04)
1 parent f900575 commit 5b792f9

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

.github/workflows/build-unix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
linux-x86_64)
117117
DOWN_CMD="./bin/spc-alpine-docker download"
118118
BUILD_CMD="./bin/spc-alpine-docker build"
119-
RUNS_ON="ubuntu-latest"
119+
RUNS_ON="ubuntu-24.04"
120120
;;
121121
linux-aarch64)
122122
DOWN_CMD="./bin/spc-alpine-docker download"
@@ -136,7 +136,7 @@ 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-14"
140140
;;
141141
macos-aarch64)
142142
DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download"

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ jobs:
8585
- "8.4"
8686
operating-system:
8787
- "ubuntu-latest"
88-
#- "macos-13"
8988
#- "debian-arm64-self-hosted"
9089
- "macos-14"
9190

@@ -99,11 +98,11 @@ jobs:
9998
OS=""
10099
if [ "${{ matrix.operating-system }}" = "ubuntu-latest" ]; then
101100
OS="linux-x86_64"
102-
elif [ "${{ matrix.operating-system }}" = "macos-13" ]; then
101+
elif [ "${{ matrix.operating-system }}" = "macos-14" ]; then
103102
OS="macos-x86_64"
104103
elif [ "${{ matrix.operating-system }}" = "debian-arm64-self-hosted" ]; then
105104
OS="linux-aarch64"
106-
elif [ "${{ matrix.operating-system }}" = "macos-14" ]; then
105+
elif [ "${{ matrix.operating-system }}" = "macos-15" ]; then
107106
OS="macos-aarch64"
108107
fi
109108
echo "OS=$OS" >> $GITHUB_ENV

.github/workflows/release-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
os: "ubuntu-latest"
2424
filename: "spc-linux-x86_64.tar.gz"
2525
- name: "macos-x86_64"
26-
os: "macos-13"
26+
os: "macos-14"
2727
filename: "spc-macos-x86_64.tar.gz"
2828
- name: "linux-aarch64"
2929
os: "ubuntu-latest"
3030
filename: "spc-linux-aarch64.tar.gz"
3131
- name: "macos-aarch64"
32-
os: "macos-14"
32+
os: "macos-15"
3333
filename: "spc-macos-aarch64.tar.gz"
3434
- name: "windows-x64"
3535
os: "ubuntu-latest"

src/globals/test-extensions.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
'8.4',
2020
];
2121

22-
// test os (macos-13, macos-14, macos-15, ubuntu-latest, windows-latest are available)
22+
// test os
2323
$test_os = [
24-
// 'macos-13',
2524
// 'macos-14',
2625
// 'macos-15',
27-
// 'ubuntu-latest',
2826
// 'ubuntu-22.04',
2927
// 'ubuntu-24.04',
3028
'ubuntu-22.04-arm',
@@ -143,8 +141,7 @@ function quote2(string $param): string
143141

144142
$prefix = match ($argv[2] ?? null) {
145143
'windows-latest', 'windows-2022', 'windows-2019', 'windows-2025' => 'powershell.exe -file .\bin\spc.ps1 ',
146-
'ubuntu-latest' => 'bin/spc-alpine-docker ',
147-
'ubuntu-24.04', 'ubuntu-24.04-arm' => './bin/spc ',
144+
'ubuntu-24.04', 'ubuntu-24.04-arm' => 'bin/spc-alpine-docker ',
148145
'ubuntu-22.04', 'ubuntu-22.04-arm' => 'bin/spc-gnu-docker ',
149146
default => 'bin/spc ',
150147
};
@@ -154,13 +151,9 @@ function quote2(string $param): string
154151
switch ($argv[2] ?? null) {
155152
case 'ubuntu-22.04':
156153
case 'ubuntu-22.04-arm':
157-
$shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
158-
break;
159-
case 'macos-13':
160154
case 'macos-14':
161155
case 'macos-15':
162156
$shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
163-
$no_strip = true;
164157
break;
165158
default:
166159
$shared_cmd = '';

0 commit comments

Comments
 (0)