CI: Switch C++11 builds to C++14

libgeos · Jan 20, 2023 · 15a0391 · 15a0391
1 parent 213f198
commit 15a0391
Showing 1 changed file with 12 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
         - cxx_compiler: g++
           c_compiler: gcc
           build_type: Coverage
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: g++
           cmake: 3.15.*
@@ -32,7 +32,7 @@ jobs:
         - cxx_compiler: g++-5
           c_compiler: gcc-5
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: 'g++-5-multilib gcc-5-multilib'
           cmake: 3.13.*
@@ -41,7 +41,7 @@ jobs:
         - cxx_compiler: g++-5
           c_compiler: gcc-5
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 32
           packages: 'g++-5-multilib gcc-5-multilib g++-multilib gcc-multilib'
           cmake: 3.13.*
@@ -50,7 +50,7 @@ jobs:
         - cxx_compiler: g++-6
           c_compiler: gcc-6
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: 'g++-6-multilib gcc-6-multilib'
           cmake: 3.13.*
@@ -59,7 +59,7 @@ jobs:
         - cxx_compiler: g++-7
           c_compiler: gcc-7
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: 'g++-7-multilib gcc-7-multilib'
           cmake: 3.13.*
@@ -68,7 +68,7 @@ jobs:
         - cxx_compiler: g++-8
           c_compiler: gcc-8
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: 'g++-8-multilib gcc-8-multilib'
           cmake: 3.13.*
@@ -77,7 +77,7 @@ jobs:
         - cxx_compiler: g++-9
           c_compiler: gcc-9
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: 'g++-9-multilib gcc-9-multilib'
           cmake: 3.13.*
@@ -86,7 +86,7 @@ jobs:
         - cxx_compiler: g++-10
           c_compiler: gcc-10
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: 'g++-10-multilib gcc-10-multilib'
           cmake: 3.13.*
@@ -113,7 +113,7 @@ jobs:
         - cxx_compiler: clang++-7
           c_compiler: clang-7
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: 'clang-7'
           cmake: 3.13.*
@@ -122,7 +122,7 @@ jobs:
         - cxx_compiler: clang++-8
           c_compiler: clang-8
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: 'clang-8'
           cmake: 3.13.*
@@ -131,21 +131,12 @@ jobs:
         - cxx_compiler: clang++-9
           c_compiler: clang-9
           build_type: Release
-          cxxstd: 11
+          cxxstd: 14
           arch: 64
           packages: 'clang-9'
           cmake: 3.13.*
           os: ubuntu-20.04
 
-        - cxx_compiler: clang++-10
-          c_compiler: clang
-          build_type: Debug
-          cxxstd: 11
-          arch: 64
-          packages: 'clang'
-          cmake: 3.17.*
-          os: ubuntu-20.04
-
         - cxx_compiler: clang++-10
           c_compiler: clang
           build_type: Release
@@ -320,12 +311,9 @@ jobs:
     strategy:
       matrix:
         xcode: [11.7, 12.4, 13.2.1]
-        cxxstd: [11]
+        cxxstd: [14]
         build_type: ['Debug']
         include:
-          - xcode: 13.2.1
-            cxxstd: 14
-            build_type: Debug
           - xcode: 13.2.1
             cxxstd: 17
             build_type: Debug