Skip to content

Commit 92e6b48

Browse files
authored
ci: use the new ARM runners for ARM builds (#1333)
1 parent e53ba34 commit 92e6b48

File tree

2 files changed

+7
-25
lines changed

2 files changed

+7
-25
lines changed

.github/workflows/docker.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
IMAGE_NAME: ${{ (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.version) || startsWith(github.ref, 'refs/tags/')) && 'dunglas/frankenphp' || 'dunglas/frankenphp-dev' }}
3030
jobs:
3131
prepare:
32-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-24.04
3333
outputs:
3434
# Push if it's a scheduled job, a tag, or if we're committing to the main branch
3535
push: ${{ (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.version) || startsWith(github.ref, 'refs/tags/') || (github.ref == 'refs/heads/main' && github.event_name != 'pull_request')) && true || false }}
@@ -100,7 +100,7 @@ jobs:
100100
VERSION: ${{ (github.ref_type == 'tag' && github.ref_name) || steps.check.outputs.ref || 'dev' }}
101101
PHP_VERSION: ${{ steps.check.outputs.php_version }}
102102
build:
103-
runs-on: ubuntu-latest
103+
runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
104104
needs:
105105
- prepare
106106
if: ${{ !fromJson(needs.prepare.outputs.skip) }}
@@ -111,12 +111,8 @@ jobs:
111111
platform: ${{ fromJson(needs.prepare.outputs.platforms) }}
112112
include:
113113
- race: ""
114-
qemu: true
115114
- platform: linux/amd64
116-
qemu: false
117115
race: "-race" # The Go race detector is only supported on amd64
118-
- platform: linux/386
119-
qemu: false
120116
exclude:
121117
# arm/v6 is only available for Alpine: https://github.com/docker-library/golang/issues/502
122118
- variant: php-${{ needs.prepare.outputs.php82_version }}-bookworm
@@ -132,11 +128,6 @@ jobs:
132128
- uses: actions/checkout@v4
133129
with:
134130
ref: ${{ needs.prepare.outputs.ref }}
135-
- name: Set up QEMU
136-
if: matrix.qemu
137-
uses: docker/setup-qemu-action@v3
138-
with:
139-
platforms: ${{ matrix.platform }}
140131
- name: Set up Docker Buildx
141132
uses: docker/setup-buildx-action@v3
142133
with:
@@ -202,7 +193,7 @@ jobs:
202193
if-no-files-found: error
203194
retention-days: 1
204195
- name: Run tests
205-
if: ${{ !matrix.qemu && !fromJson(needs.prepare.outputs.push) }}
196+
if: ${{ !fromJson(needs.prepare.outputs.push) }}
206197
run: |
207198
docker run --platform=${{ matrix.platform }} --rm \
208199
"$(jq -r '."builder-${{ matrix.variant }}"."containerimage.config.digest"' <<< "${METADATA}")" \
@@ -211,7 +202,7 @@ jobs:
211202
METADATA: ${{ steps.build.outputs.metadata }}
212203
# Adapted from https://docs.docker.com/build/ci/github-actions/multi-platform/
213204
push:
214-
runs-on: ubuntu-latest
205+
runs-on: ubuntu-24.04
215206
needs:
216207
- prepare
217208
- build

.github/workflows/static.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env:
3131
IMAGE_NAME: ${{ (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.version) || startsWith(github.ref, 'refs/tags/')) && 'dunglas/frankenphp' || 'dunglas/frankenphp-dev' }}
3232
jobs:
3333
prepare:
34-
runs-on: ubuntu-latest
34+
runs-on: ubuntu-24.04
3535
outputs:
3636
push: ${{ toJson((steps.check.outputs.ref || (github.event_name == 'workflow_dispatch' && inputs.version) || startsWith(github.ref, 'refs/tags/') || (github.ref == 'refs/heads/main' && github.event_name != 'pull_request')) && true || false) }}
3737
platforms: ${{ steps.matrix.outputs.platforms }}
@@ -74,17 +74,13 @@ jobs:
7474
debug: [false]
7575
mimalloc: [false]
7676
include:
77-
- qemu: true
7877
- platform: linux/amd64
79-
qemu: false
8078
- platform: linux/amd64
81-
qemu: false
8279
debug: true
8380
- platform: linux/amd64
84-
qemu: false
8581
mimalloc: true
8682
name: Build ${{ matrix.platform }} static binary${{ matrix.debug && ' (debug)' || '' }}${{ matrix.mimalloc && ' (mimalloc)' || '' }}
87-
runs-on: ubuntu-latest
83+
runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
8884
needs: [prepare]
8985
steps:
9086
- name: Prepare
@@ -95,11 +91,6 @@ jobs:
9591
- uses: actions/checkout@v4
9692
with:
9793
ref: ${{ needs.prepare.outputs.ref }}
98-
- name: Set up QEMU
99-
if: matrix.qemu
100-
uses: docker/setup-qemu-action@v3
101-
with:
102-
platforms: ${{ matrix.platform }}
10394
- name: Set up Docker Buildx
10495
uses: docker/setup-buildx-action@v3
10596
with:
@@ -187,7 +178,7 @@ jobs:
187178

188179
# Adapted from https://docs.docker.com/build/ci/github-actions/multi-platform/
189180
push:
190-
runs-on: ubuntu-latest
181+
runs-on: ubuntu-24.04
191182
needs:
192183
- prepare
193184
- build-linux

0 commit comments

Comments
 (0)