Update matrixbuild to current Linux distributions (#99)

bgp · Dec 10, 2023 · 2e06d3c · 2e06d3c
1 parent 3d2eed5
commit 2e06d3c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.github/images/alpine:3.17.Dockerfile → .github/images/alpine:3.19.Dockerfile b/.github/images/alpine:3.17.Dockerfile → .github/images/alpine:3.19.Dockerfile
diff --git a/.github/images/debian:trixie.Dockerfile b/.github/images/debian:trixie.Dockerfile
@@ -0,0 +1 @@
+debian.Dockerfile
diff --git a/.github/images/fedora/fedora:36.Dockerfile → .github/images/fedora/fedora:39.Dockerfile b/.github/images/fedora/fedora:36.Dockerfile → .github/images/fedora/fedora:39.Dockerfile
diff --git a/.github/images/fedora/fedora:37.Dockerfile → .github/images/fedora/fedora:40.Dockerfile b/.github/images/fedora/fedora:37.Dockerfile → .github/images/fedora/fedora:40.Dockerfile
diff --git a/.github/workflows/matrixbuild.yml b/.github/workflows/matrixbuild.yml
@@ -9,23 +9,27 @@ jobs:
       fail-fast: false
       matrix:
         dockerenv:
+          - debian:trixie
           - debian:bookworm
           - debian:bullseye
           - debian:buster
           - ubuntu:jammy
           - ubuntu:focal
           - ubuntu:bionic
+          - fedora/fedora:40
+          - fedora/fedora:39
           - fedora/fedora:38
-          - fedora/fedora:37
-          - fedora/fedora:36
           - centos/centos:stream9
           - centos/centos:stream8
           - centos/centos:7
           - rockylinux/rockylinux:9
           - rockylinux/rockylinux:8
           - alpine:edge
-          - alpine:3.17
+          - alpine:3.19
     steps:
     - uses: actions/checkout@v3
+    - 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: 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}}