diff --git a/.github/images/centos.Dockerfile b/.github/images/centos.Dockerfile index 76d3ad3..4ddf2c9 100644 --- a/.github/images/centos.Dockerfile +++ b/.github/images/centos.Dockerfile @@ -3,7 +3,7 @@ FROM quay.io/$image # Install dependencies RUN dnf -y update -RUN dnf -y install autoconf automake gcc libtool make diffutils file gzip +RUN dnf -y install autoconf automake gcc libtool make diffutils file gzip gawk # Add source code ADD . /src diff --git a/.github/images/fedora/fedora:42.Dockerfile b/.github/images/fedora/fedora:42.Dockerfile deleted file mode 100644 index 4d65eb7..0000000 --- a/.github/images/fedora/fedora:42.Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG image=centos/centos:latest -FROM quay.io/$image - -# Install dependencies -RUN dnf -y update -RUN dnf -y install autoconf automake gcc libtool make diffutils file gzip awk - -# Add source code -ADD . /src -WORKDIR /src - -# Run steps -RUN ./bootstrap -RUN ./configure -RUN make -RUN make check -RUN make distcheck diff --git a/.github/images/fedora/fedora:42.Dockerfile b/.github/images/fedora/fedora:42.Dockerfile new file mode 120000 index 0000000..50cd910 --- /dev/null +++ b/.github/images/fedora/fedora:42.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 de387c1..b36c4ff 100644 --- a/.github/workflows/matrixbuild.yml +++ b/.github/workflows/matrixbuild.yml @@ -28,6 +28,6 @@ jobs: - uses: actions/checkout@v4 - name: Work around Docker BuildKit regression # https://github.com/moby/buildkit/issues/2119: `DOCKER_BUILDKIT=1 docker build` fails if Dockerfile is a symlink - run: [ -L .github/images/${{matrix.dockerenv}}.Dockerfile ] && cp --remove-destination $(readlink -f .github/images/${{matrix.dockerenv}}.Dockerfile) .github/images/${{matrix.dockerenv}}.Dockerfile + run: cp --remove-destination $(readlink -f .github/images/${{matrix.dockerenv}}.Dockerfile) .github/images/${{matrix.dockerenv}}.Dockerfile - name: Run build on ${{matrix.dockerenv}} run: docker build . --file .github/images/${{matrix.dockerenv}}.Dockerfile --build-arg image=${{matrix.dockerenv}}