From fe6fff746438e8ca62838bb8665a1a62b4d0255f Mon Sep 17 00:00:00 2001 From: le0m Date: Thu, 29 Jan 2026 14:57:41 +0100 Subject: [PATCH] fix: build on ubuntu 22 where needed, ubuntu latest where working --- .github/workflows/publish.5.yml | 3 +-- .github/workflows/publish.7.yml | 3 +-- .github/workflows/publish.8.yml | 5 ++--- .github/workflows/publish.compat.yml | 6 ++---- .github/workflows/publish.latest.yml | 5 ++--- .github/workflows/test.8.yml | 2 +- .github/workflows/test.latest.yml | 2 +- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/publish.5.yml b/.github/workflows/publish.5.yml index c208a0a..8a78812 100644 --- a/.github/workflows/publish.5.yml +++ b/.github/workflows/publish.5.yml @@ -25,8 +25,7 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/publish.7.yml b/.github/workflows/publish.7.yml index cdbbd69..b3f0ae2 100644 --- a/.github/workflows/publish.7.yml +++ b/.github/workflows/publish.7.yml @@ -25,8 +25,7 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/publish.8.yml b/.github/workflows/publish.8.yml index f0b96f8..626a971 100644 --- a/.github/workflows/publish.8.yml +++ b/.github/workflows/publish.8.yml @@ -9,7 +9,7 @@ on: jobs: publish-8: name: Build and publish PHP 8 images - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest if: ${{ github.event.workflow_run.conclusion == 'success' && !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }} strategy: matrix: @@ -20,8 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/publish.compat.yml b/.github/workflows/publish.compat.yml index 10468eb..faf49a2 100644 --- a/.github/workflows/publish.compat.yml +++ b/.github/workflows/publish.compat.yml @@ -20,8 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -35,8 +34,7 @@ jobs: password: ${{ secrets.DOCKER_PULL_PASS_4 }} - name: Pull base image - run: | - docker pull debian:stretch-slim + run: docker pull debian:stretch-slim - name: Login to DockerHub (push) uses: docker/login-action@v3 diff --git a/.github/workflows/publish.latest.yml b/.github/workflows/publish.latest.yml index 2cddb54..1f96e6f 100644 --- a/.github/workflows/publish.latest.yml +++ b/.github/workflows/publish.latest.yml @@ -9,7 +9,7 @@ on: jobs: publish-8: name: Build and publish PHP 8 images - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest if: ${{ github.event.workflow_run.conclusion == 'success' && !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }} strategy: matrix: @@ -19,8 +19,7 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/test.8.yml b/.github/workflows/test.8.yml index fd78412..bf39b1b 100644 --- a/.github/workflows/test.8.yml +++ b/.github/workflows/test.8.yml @@ -12,7 +12,7 @@ on: jobs: test-8: name: Build and test PHP 8 images - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest if: ${{ !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }} strategy: matrix: diff --git a/.github/workflows/test.latest.yml b/.github/workflows/test.latest.yml index ee1f545..27c0d0b 100644 --- a/.github/workflows/test.latest.yml +++ b/.github/workflows/test.latest.yml @@ -12,7 +12,7 @@ on: jobs: test-latest: name: Build and test latest PHP images - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest if: ${{ !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }} strategy: matrix: