Skip to content

Commit 4be0765

Browse files
authored
Update pack-libs.yml
1 parent d26a786 commit 4be0765

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

.github/workflows/pack-libs.yml

+21-9
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ jobs:
2626
strategy:
2727
matrix:
2828
runner:
29-
- ubuntu-latest
30-
- ubuntu-20.04
29+
- ubuntu-24.04 # x86_64 musl
30+
- ubuntu-22.04 # x86_64 glibc
31+
- ubuntu-24.04-arm # aarch64 musl
32+
- ubuntu-22.04-arm # aarch64 glibc
3133
- macos-13
3234
- windows-2019
3335
- macos-14
@@ -86,15 +88,25 @@ jobs:
8688
shell: bash
8789
run: |
8890
case "${{ matrix.runner }}" in
89-
ubuntu-latest)
90-
echo "OS=linux" >> "$GITHUB_OUTPUT"
91+
ubuntu-24.04)
92+
echo "OS=linux-musl" >> "$GITHUB_OUTPUT"
9193
echo "ARCH=x86_64" >> "$GITHUB_OUTPUT"
9294
echo "CMD=bin/spc-alpine-docker" >> "$GITHUB_OUTPUT"
9395
;;
94-
ubuntu-20.04)
95-
echo "OS=linux" >> "$GITHUB_OUTPUT"
96+
ubuntu-22.04)
97+
echo "OS=linux-glibc" >> "$GITHUB_OUTPUT"
98+
echo "ARCH=x86_64" >> "$GITHUB_OUTPUT"
99+
echo "CMD=bin/spc-gnu-docker" >> "$GITHUB_OUTPUT"
100+
;;
101+
ubuntu-24.04-arm)
102+
echo "OS=linux-musl" >> "$GITHUB_OUTPUT"
103+
echo "ARCH=aarch64" >> "$GITHUB_OUTPUT"
104+
echo CMD="bin/spc-alpine-docker" >> "$GITHUB_OUTPUT"
105+
;;
106+
ubuntu-22.04-arm)
107+
echo "OS=linux-glibc" >> "$GITHUB_OUTPUT"
96108
echo "ARCH=aarch64" >> "$GITHUB_OUTPUT"
97-
echo CMD="SPC_USE_ARCH=aarch64 bin/spc-alpine-docker" >> "$GITHUB_OUTPUT"
109+
echo "CMD=bin/spc-gnu-docker" >> "$GITHUB_OUTPUT"
98110
;;
99111
windows-2019)
100112
echo "OS=windows" >> "$GITHUB_OUTPUT"
@@ -121,7 +133,7 @@ jobs:
121133
ref: main
122134

123135
- name: "Setup PHP"
124-
if: matrix.runner != 'ubuntu-20.04'
136+
if: matrix.runner != 'ubuntu-22.04' && matrix.runner != 'ubuntu-22.04-arm'
125137
uses: shivammathur/setup-php@v2
126138
with:
127139
php-version: 8.4
@@ -146,7 +158,7 @@ jobs:
146158
key: pack-lib-dependencies
147159

148160
- name: "Install Dependencies"
149-
if: matrix.runner != 'ubuntu-20.04'
161+
if: matrix.runner != 'ubuntu-22.04' && matrix.runner != 'ubuntu-22.04-arm'
150162
run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
151163

152164
- run: ${{ steps.process-env.outputs.CMD }} doctor --auto-fix

0 commit comments

Comments
 (0)