From 0678439386a33afdc776c76d8b88edc1a627ffe5 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 25 Dec 2024 12:21:17 +0100 Subject: [PATCH] Update matrixbuild to current Linux distributions (#120) --- .../{alpine:3.19.Dockerfile => alpine:3.21.Dockerfile} | 0 .github/images/centos.Dockerfile | 4 ++-- .../{centos:7.Dockerfile => centos:stream10.Dockerfile} | 0 .github/images/fedora/fedora:39.Dockerfile | 1 - .../fedora:41.Dockerfile} | 0 .../{fedora:38.Dockerfile => fedora:42.Dockerfile} | 0 .github/images/ubuntu:latest.Dockerfile | 1 - ...{debian:buster.Dockerfile => ubuntu:noble.Dockerfile} | 0 .github/workflows/matrixbuild.yml | 9 +++++---- 9 files changed, 7 insertions(+), 8 deletions(-) rename .github/images/{alpine:3.19.Dockerfile => alpine:3.21.Dockerfile} (100%) rename .github/images/centos/{centos:7.Dockerfile => centos:stream10.Dockerfile} (100%) delete mode 120000 .github/images/fedora/fedora:39.Dockerfile rename .github/images/{centos/centos:stream8.Dockerfile => fedora/fedora:41.Dockerfile} (100%) rename .github/images/fedora/{fedora:38.Dockerfile => fedora:42.Dockerfile} (100%) delete mode 120000 .github/images/ubuntu:latest.Dockerfile rename .github/images/{debian:buster.Dockerfile => ubuntu:noble.Dockerfile} (100%) diff --git a/.github/images/alpine:3.19.Dockerfile b/.github/images/alpine:3.21.Dockerfile similarity index 100% rename from .github/images/alpine:3.19.Dockerfile rename to .github/images/alpine:3.21.Dockerfile diff --git a/.github/images/centos.Dockerfile b/.github/images/centos.Dockerfile index c44c022..76d3ad3 100644 --- a/.github/images/centos.Dockerfile +++ b/.github/images/centos.Dockerfile @@ -2,8 +2,8 @@ ARG image=centos/centos:latest FROM quay.io/$image # Install dependencies -RUN if command -v yum > /dev/null; then dnf=yum; fi; ${dnf:-dnf} update -y -RUN if command -v yum > /dev/null; then dnf=yum; fi; ${dnf:-dnf} install -y autoconf automake gcc libtool make diffutils file gzip +RUN dnf -y update +RUN dnf -y install autoconf automake gcc libtool make diffutils file gzip # Add source code ADD . /src diff --git a/.github/images/centos/centos:7.Dockerfile b/.github/images/centos/centos:stream10.Dockerfile similarity index 100% rename from .github/images/centos/centos:7.Dockerfile rename to .github/images/centos/centos:stream10.Dockerfile diff --git a/.github/images/fedora/fedora:39.Dockerfile b/.github/images/fedora/fedora:39.Dockerfile deleted file mode 120000 index 50cd910..0000000 --- a/.github/images/fedora/fedora:39.Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../centos.Dockerfile \ No newline at end of file diff --git a/.github/images/centos/centos:stream8.Dockerfile b/.github/images/fedora/fedora:41.Dockerfile similarity index 100% rename from .github/images/centos/centos:stream8.Dockerfile rename to .github/images/fedora/fedora:41.Dockerfile diff --git a/.github/images/fedora/fedora:38.Dockerfile b/.github/images/fedora/fedora:42.Dockerfile similarity index 100% rename from .github/images/fedora/fedora:38.Dockerfile rename to .github/images/fedora/fedora:42.Dockerfile diff --git a/.github/images/ubuntu:latest.Dockerfile b/.github/images/ubuntu:latest.Dockerfile deleted file mode 120000 index 504b510..0000000 --- a/.github/images/ubuntu:latest.Dockerfile +++ /dev/null @@ -1 +0,0 @@ -debian.Dockerfile \ No newline at end of file diff --git a/.github/images/debian:buster.Dockerfile b/.github/images/ubuntu:noble.Dockerfile similarity index 100% rename from .github/images/debian:buster.Dockerfile rename to .github/images/ubuntu:noble.Dockerfile diff --git a/.github/workflows/matrixbuild.yml b/.github/workflows/matrixbuild.yml index a4218fa..b36c4ff 100644 --- a/.github/workflows/matrixbuild.yml +++ b/.github/workflows/matrixbuild.yml @@ -12,17 +12,18 @@ jobs: - debian:trixie - debian:bookworm - debian:bullseye - - debian:buster + - ubuntu:noble - ubuntu:jammy - ubuntu:focal - - ubuntu:latest + - fedora/fedora:42 + - fedora/fedora:41 - fedora/fedora:40 - - fedora/fedora:39 + - centos/centos:stream10 - centos/centos:stream9 - rockylinux/rockylinux:9 - rockylinux/rockylinux:8 - alpine:edge - - alpine:3.19 + - alpine:3.21 steps: - uses: actions/checkout@v4 - name: Work around Docker BuildKit regression