From 547b3c2fb89be6d262e5086b5f66439267850b67 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 16 Mar 2026 01:20:02 +0100 Subject: [PATCH] Fix and update workflow actions and containers (#133) - Add tar for failing Alpine (matrix)builds - Add matrixbuild for Alpine 3.23 - Remove matrixbuild for Alpine 3.21 - Add matrixbuilds for Fedora 43 and 44 - Remove matrixbuilds for Fedora 40 and 41 - Add matrixbuild for Rocky Linux 10 - Update GitHub actions to current versions --- .github/images/alpine.Dockerfile | 2 +- .../{alpine:3.21.Dockerfile => alpine:3.23.Dockerfile} | 0 .github/images/alpine:3.Dockerfile | 2 +- .../{fedora:40.Dockerfile => fedora:43.Dockerfile} | 0 .../{fedora:41.Dockerfile => fedora:44.Dockerfile} | 0 .github/images/rockylinux/rockylinux:10.Dockerfile | 1 + .github/workflows/build-container.yml | 10 +++++----- .github/workflows/matrixbuild.yml | 7 ++++--- 8 files changed, 12 insertions(+), 10 deletions(-) rename .github/images/{alpine:3.21.Dockerfile => alpine:3.23.Dockerfile} (100%) rename .github/images/fedora/{fedora:40.Dockerfile => fedora:43.Dockerfile} (100%) rename .github/images/fedora/{fedora:41.Dockerfile => fedora:44.Dockerfile} (100%) create mode 120000 .github/images/rockylinux/rockylinux:10.Dockerfile diff --git a/.github/images/alpine.Dockerfile b/.github/images/alpine.Dockerfile index 154c06b..073c760 100644 --- a/.github/images/alpine.Dockerfile +++ b/.github/images/alpine.Dockerfile @@ -3,7 +3,7 @@ FROM $image # Install dependencies RUN apk upgrade -RUN apk add autoconf automake file gcc gzip libtool make musl-dev +RUN apk add autoconf automake file gcc gzip libtool make musl-dev tar # Add source code ADD . /src diff --git a/.github/images/alpine:3.21.Dockerfile b/.github/images/alpine:3.23.Dockerfile similarity index 100% rename from .github/images/alpine:3.21.Dockerfile rename to .github/images/alpine:3.23.Dockerfile diff --git a/.github/images/alpine:3.Dockerfile b/.github/images/alpine:3.Dockerfile index 66e1c30..36763bd 100644 --- a/.github/images/alpine:3.Dockerfile +++ b/.github/images/alpine:3.Dockerfile @@ -5,7 +5,7 @@ FROM $IMAGE as builder # Install dependencies RUN apk upgrade -RUN apk add autoconf automake file gcc gzip libtool make musl-dev +RUN apk add autoconf automake file gcc gzip libtool make musl-dev tar # Add source code ADD . /src diff --git a/.github/images/fedora/fedora:40.Dockerfile b/.github/images/fedora/fedora:43.Dockerfile similarity index 100% rename from .github/images/fedora/fedora:40.Dockerfile rename to .github/images/fedora/fedora:43.Dockerfile diff --git a/.github/images/fedora/fedora:41.Dockerfile b/.github/images/fedora/fedora:44.Dockerfile similarity index 100% rename from .github/images/fedora/fedora:41.Dockerfile rename to .github/images/fedora/fedora:44.Dockerfile diff --git a/.github/images/rockylinux/rockylinux:10.Dockerfile b/.github/images/rockylinux/rockylinux:10.Dockerfile new file mode 120000 index 0000000..50cd910 --- /dev/null +++ b/.github/images/rockylinux/rockylinux:10.Dockerfile @@ -0,0 +1 @@ +../centos.Dockerfile \ No newline at end of file diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 0bc5ece..f7b6d2d 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -29,14 +29,14 @@ jobs: - # Add support for more platforms with QEMU # https://github.com/docker/setup-qemu-action name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Docker meta id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ghcr.io/${{ github.repository_owner }}/bgpq4 tags: | @@ -49,14 +49,14 @@ jobs: - name: Login to GitHub Container Registry if: github.repository_owner == 'bgp' - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: file: .github/images/alpine:3.Dockerfile context: . diff --git a/.github/workflows/matrixbuild.yml b/.github/workflows/matrixbuild.yml index b36c4ff..8a5e1f7 100644 --- a/.github/workflows/matrixbuild.yml +++ b/.github/workflows/matrixbuild.yml @@ -15,15 +15,16 @@ jobs: - ubuntu:noble - ubuntu:jammy - ubuntu:focal + - fedora/fedora:44 + - fedora/fedora:43 - fedora/fedora:42 - - fedora/fedora:41 - - fedora/fedora:40 - centos/centos:stream10 - centos/centos:stream9 + - rockylinux/rockylinux:10 - rockylinux/rockylinux:9 - rockylinux/rockylinux:8 - alpine:edge - - alpine:3.21 + - alpine:3.23 steps: - uses: actions/checkout@v4 - name: Work around Docker BuildKit regression