From 8b804f83fda65d82bbf993188ef2c1dbe92740e3 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 6 Feb 2022 09:30:05 +0100 Subject: [PATCH] Update matrixbuild to current Linux distributions (#55) Previously, at the time of #50, broken Fedora Rawhide, 35, CentOS Stream 9 (development) have been fixed. Switch Alpine 3.14 -> 3.15. --- .../{alpine:3.14.Dockerfile => alpine:3.15.Dockerfile} | 0 .github/images/centos.Dockerfile | 2 +- .../centos:stream9.Dockerfile} | 0 .github/images/fedora/fedora:35.Dockerfile | 1 + .github/images/fedora/fedora:36.Dockerfile | 1 + .github/workflows/matrixbuild.yml | 6 ++++-- 6 files changed, 7 insertions(+), 3 deletions(-) rename .github/images/{alpine:3.14.Dockerfile => alpine:3.15.Dockerfile} (100%) rename .github/images/{fedora/fedora:33.Dockerfile => centos/centos:stream9.Dockerfile} (100%) create mode 120000 .github/images/fedora/fedora:35.Dockerfile create mode 120000 .github/images/fedora/fedora:36.Dockerfile diff --git a/.github/images/alpine:3.14.Dockerfile b/.github/images/alpine:3.15.Dockerfile similarity index 100% rename from .github/images/alpine:3.14.Dockerfile rename to .github/images/alpine:3.15.Dockerfile diff --git a/.github/images/centos.Dockerfile b/.github/images/centos.Dockerfile index 3952e53..06c03a7 100644 --- a/.github/images/centos.Dockerfile +++ b/.github/images/centos.Dockerfile @@ -3,7 +3,7 @@ FROM quay.io/$image # Install dependencies RUN yum update -y -RUN yum install -y autoconf automake gcc libtool make +RUN yum install -y autoconf automake gcc libtool make diffutils file # Add source code ADD . /src diff --git a/.github/images/fedora/fedora:33.Dockerfile b/.github/images/centos/centos:stream9.Dockerfile similarity index 100% rename from .github/images/fedora/fedora:33.Dockerfile rename to .github/images/centos/centos:stream9.Dockerfile diff --git a/.github/images/fedora/fedora:35.Dockerfile b/.github/images/fedora/fedora:35.Dockerfile new file mode 120000 index 0000000..50cd910 --- /dev/null +++ b/.github/images/fedora/fedora:35.Dockerfile @@ -0,0 +1 @@ +../centos.Dockerfile \ No newline at end of file diff --git a/.github/images/fedora/fedora:36.Dockerfile b/.github/images/fedora/fedora:36.Dockerfile new file mode 120000 index 0000000..50cd910 --- /dev/null +++ b/.github/images/fedora/fedora:36.Dockerfile @@ -0,0 +1 @@ +../centos.Dockerfile \ No newline at end of file diff --git a/.github/workflows/matrixbuild.yml b/.github/workflows/matrixbuild.yml index a02351c..abc27c1 100644 --- a/.github/workflows/matrixbuild.yml +++ b/.github/workflows/matrixbuild.yml @@ -14,13 +14,15 @@ jobs: - debian:buster - ubuntu:focal - ubuntu:bionic + - fedora/fedora:36 + - fedora/fedora:35 - fedora/fedora:34 - - fedora/fedora:33 + - centos/centos:stream9 - centos/centos:stream8 - centos/centos:7 - rockylinux/rockylinux:8 - alpine:edge - - alpine:3.14 + - alpine:3.15 steps: - uses: actions/checkout@v1 - name: Run build on ${{matrix.dockerenv}}