Github action: Cleanup builds

osmcode · Jun 15, 2023 · 0c2fca9 · 0c2fca9
1 parent 7f5543f
commit 0c2fca9
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [Ubuntu-18, Ubuntu-20, Ubuntu-22, Debian-10, Debian-11, Debian-12, Debian-Testing, Debian-Experimental, Fedora-35, Fedora-36]
+        name: [Ubuntu-18, Ubuntu-20, Ubuntu-22, Debian-10, Debian-11, Debian-12, Debian-Testing, Debian-Experimental, Fedora-35, Fedora-36, Fedora-37, Fedora-38]
         build_type: [Dev]
         cpp_compiler: [g++]
         cpp_version: [c++14]
@@ -22,7 +22,7 @@ jobs:
             image: "ubuntu:20.04"
             ubuntu: 20
           - name: Ubuntu-22
-            # Uses gcc 12.2.0, clang 15.0.2, cmake 3.24.2
+            # Uses gcc 12.2.0, clang 15.0.7, cmake 3.24.2
             image: "ubuntu:22.04"
             ubuntu: 22
             CXXFLAGS: -Wno-stringop-overread
@@ -33,36 +33,29 @@ jobs:
             # Uses gcc 10.2.1, clang 11.0.1, cmake 3.18.4
             image: "debian:bullseye"
           - name: Debian-11
-            # Uses gcc 10.2.1, clang 11.0.1, cmake 3.18.4
             image: "debian:bullseye"
             cpp_version: c++17
           - name: Debian-11
-            # Uses gcc 10.2.1, clang 11.0.1, cmake 3.18.4
             image: "debian:bullseye"
             cpp_version: c++20
           - name: Debian-11
-            # Uses gcc 10.2.1, clang 11.0.1, cmake 3.18.4
+            image: "debian:bullseye"
+            c_compiler: clang
+            cpp_compiler: clang++
+          - name: Debian-11
             image: "debian:bullseye"
             c_compiler: clang
             cpp_compiler: clang++
             cpp_version: c++17
           - name: Debian-11
-            # Uses gcc 10.2.1, clang 11.0.1, cmake 3.18.4
             image: "debian:bullseye"
             c_compiler: clang
             cpp_compiler: clang++
             cpp_version: c++20
           - name: Debian-11
-            # Uses gcc 10.2.1, clang 11.0.1, cmake 3.18.4
             image: "debian:bullseye"
             build_type: RelWithDebInfo
           - name: Debian-11
-            # Uses gcc 10.2.1, clang 11.0.1, cmake 3.18.4
-            image: "debian:bullseye"
-            c_compiler: clang
-            cpp_compiler: clang++
-          - name: Debian-11
-            # Uses gcc 10.2.1, clang 11.0.1, cmake 3.18.4
             image: "debian:bullseye"
             c_compiler: clang
             cpp_compiler: clang++
@@ -73,27 +66,32 @@ jobs:
             image: "debian:bookworm"
             CXXFLAGS: -Wno-stringop-overread
           - name: Debian-12
-            # Uses gcc 12.2.0, clang 15.0.6, cmake 3.25.1
             image: "debian:bookworm"
             cpp_version: c++17
             CXXFLAGS: -Wno-stringop-overread
           - name: Debian-12
-            # Uses gcc 12.2.0, clang 15.0.6, cmake 3.25.1
             image: "debian:bookworm"
             cpp_version: c++20
             CXXFLAGS: -Wno-stringop-overread
           - name: Debian-12
-            # Uses gcc 12.2.0, clang 15.0.6, cmake 3.25.1
             image: "debian:bookworm"
-            build_type: RelWithDebInfo
-            CXXFLAGS: -Wno-stringop-overread
+            c_compiler: clang
+            cpp_compiler: clang++
           - name: Debian-12
-            # Uses gcc 12.2.0, clang 15.0.6, cmake 3.25.1
             image: "debian:bookworm"
             c_compiler: clang
             cpp_compiler: clang++
+            cpp_version: c++17
+          - name: Debian-12
+            image: "debian:bookworm"
+            c_compiler: clang
+            cpp_compiler: clang++
+            cpp_version: c++20
+          - name: Debian-12
+            image: "debian:bookworm"
+            build_type: RelWithDebInfo
+            CXXFLAGS: -Wno-stringop-overread
           - name: Debian-12
-            # Uses gcc 12.2.0, clang 15.0.6, cmake 3.25.1
             image: "debian:bookworm"
             c_compiler: clang
             cpp_compiler: clang++