Skip to content

Commit 1223448

Browse files
committed
change platform run on ubuntu-24.04-arm when needed
1 parent d6ae45c commit 1223448

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

.github/workflows/release.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535

3636
jobs:
3737
prepare:
38-
runs-on: ubuntu-22.04
38+
runs-on: ubuntu-24.04
3939
outputs:
4040
variants: ${{ steps.matrix.outputs.variants }}
4141
platforms: ${{ steps.matrix.outputs.platforms }}
@@ -156,7 +156,7 @@ jobs:
156156
PHP_VERSIONS: ${{ steps.check_image.outputs.php_versions }}
157157

158158
build:
159-
runs-on: ubuntu-22.04
159+
runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
160160
needs:
161161
- prepare
162162
if: ${{ needs.prepare.outputs.php_versions != '' }}
@@ -172,9 +172,6 @@ jobs:
172172
- name: Checkout
173173
uses: actions/checkout@v4
174174

175-
- name: Set up QEMU
176-
uses: docker/setup-qemu-action@v3
177-
178175
- name: Set up Docker Buildx
179176
uses: docker/setup-buildx-action@v3
180177

@@ -188,7 +185,7 @@ jobs:
188185

189186
- name: Build images and push
190187
id: bake
191-
uses: docker/bake-action@v5
188+
uses: docker/bake-action@v6
192189
with:
193190
targets: |
194191
${{ matrix.variant }}-base
@@ -242,7 +239,7 @@ jobs:
242239
retention-days: 1
243240

244241
merge:
245-
runs-on: ubuntu-22.04
242+
runs-on: ubuntu-24.04
246243
if: github.event_name != 'pull_request'
247244
needs:
248245
- prepare

.github/workflows/security.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
scan:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-24.04
1111
strategy:
1212
fail-fast: false
1313
matrix:

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ RUN <<EOT sh
2424
sysvsem-stable \
2525
amqp-stable \
2626
redis-stable \
27-
pcntl-stable
27+
pcntl-stable \
28+
bcmath-stable
2829
apt-get update
2930
apt-get install -y libexpat1=2.5.0-1+deb12u1 libgstreamer1.0-0=1.22.0-2+deb12u1
3031
EOT

0 commit comments

Comments
 (0)