From 2e06d3c38934f373e6caa8d1f2a22ff7181d0416 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert-scheck@users.noreply.github.com>
Date: Sun, 10 Dec 2023 05:08:50 +0100
Subject: [PATCH] Update matrixbuild to current Linux distributions (#99)

---
 .../{alpine:3.17.Dockerfile => alpine:3.19.Dockerfile} |  0
 .github/images/debian:trixie.Dockerfile                |  1 +
 .../{fedora:36.Dockerfile => fedora:39.Dockerfile}     |  0
 .../{fedora:37.Dockerfile => fedora:40.Dockerfile}     |  0
 .github/workflows/matrixbuild.yml                      | 10 +++++++---
 5 files changed, 8 insertions(+), 3 deletions(-)
 rename .github/images/{alpine:3.17.Dockerfile => alpine:3.19.Dockerfile} (100%)
 create mode 120000 .github/images/debian:trixie.Dockerfile
 rename .github/images/fedora/{fedora:36.Dockerfile => fedora:39.Dockerfile} (100%)
 rename .github/images/fedora/{fedora:37.Dockerfile => fedora:40.Dockerfile} (100%)

diff --git a/.github/images/alpine:3.17.Dockerfile b/.github/images/alpine:3.19.Dockerfile
similarity index 100%
rename from .github/images/alpine:3.17.Dockerfile
rename to .github/images/alpine:3.19.Dockerfile
diff --git a/.github/images/debian:trixie.Dockerfile b/.github/images/debian:trixie.Dockerfile
new file mode 120000
index 0000000..504b510
--- /dev/null
+++ b/.github/images/debian:trixie.Dockerfile
@@ -0,0 +1 @@
+debian.Dockerfile
\ No newline at end of file
diff --git a/.github/images/fedora/fedora:36.Dockerfile b/.github/images/fedora/fedora:39.Dockerfile
similarity index 100%
rename from .github/images/fedora/fedora:36.Dockerfile
rename to .github/images/fedora/fedora:39.Dockerfile
diff --git a/.github/images/fedora/fedora:37.Dockerfile b/.github/images/fedora/fedora:40.Dockerfile
similarity index 100%
rename from .github/images/fedora/fedora:37.Dockerfile
rename to .github/images/fedora/fedora:40.Dockerfile
diff --git a/.github/workflows/matrixbuild.yml b/.github/workflows/matrixbuild.yml
index ec6c006..cfb56dc 100644
--- 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}}