Port compiler version builds

thetic · thetic · commit 4ecb65b0b44e · 2022-12-13T08:41:35.000-08:00
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
@@ -182,6 +182,20 @@ jobs:
             os: ubuntu-latest
             cmake_args: -DCMAKE_CXX_STANDARD=20
             preset: GNU
+          - name: GCC-10
+            os: ubuntu-20.04
+            cmake_args: >
+              -DCMAKE_C_COMPILER=gcc-10
+              -DCMAKE_CXX_COMPILER=g++-10
+              -DCMAKE_CXX_STANDARD=17
+            preset: GNU
+          - name: Clang-11
+            os: ubuntu-20.04
+            cmake_args: >
+              -DCMAKE_C_COMPILER=clang-11
+              -DCMAKE_CXX_COMPILER=clang++-11
+              -DCMAKE_CXX_STANDARD=17
+            preset: Clang
           - name: MinGW
             os: ubuntu-latest
             preset: MinGW
diff --git a/.travis.yml b/.travis.yml
@@ -28,27 +28,6 @@ jobs:
 # Extended builds, different C++ version and build tools
     - stage: extended build & test
 
-#   New compilers can be added here. Need to be cleared when compiler becomes standard
-    - compiler: gcc
-      env: BUILD=cmake CPP_STD=17
-        - CC=gcc-10
-        - CXX=g++-10
-      addons:
-        apt:
-          packages: ['g++-10']
-          sources:
-            - sourceline: 'ppa:ubuntu-toolchain-r/test'
-    - compiler: clang
-      env: BUILD=cmake CPP_STD=17
-        - CC=clang-11
-        - CXX=clang++-11
-      addons:
-        apt:
-          sources:
-            - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-          packages: ['clang-11', 'libc++-11-dev', 'libc++abi-11-dev']
-
 #   Specific other tests
     - compiler: gcc
       env: BUILD=autotools_cmake_install_test
diff --git a/scripts/travis_ci_build.sh b/scripts/travis_ci_build.sh
@@ -12,19 +12,6 @@ if [ "x$BUILD" = "xautotools" ]; then
     make tdd
 fi
 
-if [ "x$BUILD" = "xcmake" ]; then
-    BUILD_ARGS=("-DWERROR=ON")
-
-    if [ -n "$CPP_STD" ]; then
-        BUILD_ARGS+=("-DCMAKE_CXX_STANDARD=$CPP_STD")
-    fi
-
-    cmake --version
-    cmake "${BUILD_ARGS[@]}" ..
-    make
-    ctest -V
-fi
-
 if [ "x$BUILD" = "xautotools_cmake_install_test" ]; then
     autoreconf -i ..
     ../configure
