Github action: Update list of OSes we are running/testing on

osmcode · Jun 20, 2024 · 7416c78 · 7416c78
1 parent f87b8ee
commit 7416c78
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,15 +8,11 @@ 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, Fedora-37, Fedora-38]
+        name: [Ubuntu-20, Ubuntu-22, Ubuntu-24, Debian-10, Debian-11, Debian-12, Debian-Testing, Debian-Experimental, Fedora-37, Fedora-38, Fedora-39, Fedora-40]
         build_type: [Dev]
         cpp_compiler: [g++]
         cpp_version: [c++14]
         include:
-          - name: Ubuntu-18
-            # Uses gcc 7.5.0, clang 6.0.0, cmake 3.10.2
-            image: "ubuntu:18.04"
-            ubuntu: 18
           - name: Ubuntu-20
             # Uses gcc 9.3.0, clang 10.0.0, cmake 3.16.3
             image: "ubuntu:20.04"
@@ -26,6 +22,10 @@ jobs:
             image: "ubuntu:22.04"
             ubuntu: 22
             CXXFLAGS: -Wno-stringop-overread
+          - name: Ubuntu-24
+            image: "ubuntu:24.04"
+            ubuntu: 24
+            CXXFLAGS: -Wno-stringop-overread
           - name: Debian-10
             # Uses gcc 8.3.0, clang 7.0.1, cmake 3.13.4
             image: "debian:buster"
@@ -111,14 +111,6 @@ jobs:
             image: "debian:experimental"
             c_compiler: clang
             cpp_compiler: clang++
-          - name: Fedora-35
-            # Uses gcc 11.2.1, clang 12.0.1, cmake 3.20.5
-            image: "fedora:35"
-            CXXFLAGS: -Wno-stringop-overread
-          - name: Fedora-36
-            # Uses gcc 12.2.0, clang 14.0.5, cmake 3.24.2
-            image: "fedora:36"
-            CXXFLAGS: -Wno-stringop-overread
           - name: Fedora-37
             # Uses gcc 12.3.1, clang 15.0.7, cmake 3.26.4
             image: "fedora:37"
@@ -127,6 +119,12 @@ jobs:
             # Uses gcc 13.0.1, clang 16.0.5, cmake 3.26.4
             image: "fedora:38"
             CXXFLAGS: -Wno-stringop-overread
+          - name: Fedora-39
+            image: "fedora:39"
+            CXXFLAGS: -Wno-stringop-overread
+          - name: Fedora-40
+            image: "fedora:40"
+            CXXFLAGS: -Wno-stringop-overread
     container:
       image: ${{ matrix.image }}
       env:
@@ -211,7 +209,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - "macos-11"
           - "macos-12"
           - "macos-13"
         build_type: [Dev]