Skip to content

Commit fe6fff7

Browse files
committed
fix: build on ubuntu 22 where needed, ubuntu latest where working
1 parent 46e0167 commit fe6fff7

7 files changed

Lines changed: 10 additions & 16 deletions

File tree

.github/workflows/publish.5.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525
uses: actions/checkout@v4
2626

2727
- name: Set up QEMU
28-
run: |
29-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
28+
uses: docker/setup-qemu-action@v3
3029

3130
- name: Set up Docker Buildx
3231
uses: docker/setup-buildx-action@v3

.github/workflows/publish.7.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525
uses: actions/checkout@v4
2626

2727
- name: Set up QEMU
28-
run: |
29-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
28+
uses: docker/setup-qemu-action@v3
3029

3130
- name: Set up Docker Buildx
3231
uses: docker/setup-buildx-action@v3

.github/workflows/publish.8.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
publish-8:
1111
name: Build and publish PHP 8 images
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-latest
1313
if: ${{ github.event.workflow_run.conclusion == 'success' && !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }}
1414
strategy:
1515
matrix:
@@ -20,8 +20,7 @@ jobs:
2020
uses: actions/checkout@v4
2121

2222
- name: Set up QEMU
23-
run: |
24-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
23+
uses: docker/setup-qemu-action@v3
2524

2625
- name: Set up Docker Buildx
2726
uses: docker/setup-buildx-action@v3

.github/workflows/publish.compat.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
uses: actions/checkout@v4
2121

2222
- name: Set up QEMU
23-
run: |
24-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
23+
uses: docker/setup-qemu-action@v3
2524

2625
- name: Set up Docker Buildx
2726
uses: docker/setup-buildx-action@v3
@@ -35,8 +34,7 @@ jobs:
3534
password: ${{ secrets.DOCKER_PULL_PASS_4 }}
3635

3736
- name: Pull base image
38-
run: |
39-
docker pull debian:stretch-slim
37+
run: docker pull debian:stretch-slim
4038

4139
- name: Login to DockerHub (push)
4240
uses: docker/login-action@v3

.github/workflows/publish.latest.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
publish-8:
1111
name: Build and publish PHP 8 images
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-latest
1313
if: ${{ github.event.workflow_run.conclusion == 'success' && !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }}
1414
strategy:
1515
matrix:
@@ -19,8 +19,7 @@ jobs:
1919
uses: actions/checkout@v4
2020

2121
- name: Set up QEMU
22-
run: |
23-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
22+
uses: docker/setup-qemu-action@v3
2423

2524
- name: Set up Docker Buildx
2625
uses: docker/setup-buildx-action@v3

.github/workflows/test.8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
test-8:
1414
name: Build and test PHP 8 images
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-latest
1616
if: ${{ !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }}
1717
strategy:
1818
matrix:

.github/workflows/test.latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
test-latest:
1414
name: Build and test latest PHP images
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-latest
1616
if: ${{ !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }}
1717
strategy:
1818
matrix:

0 commit comments

Comments
 (0)