- updated continuous integration settings

* Restored Clang 6 target by removing GCC 11 because its libstdc++ cannot be used with older compilers * Replaced GCC 10 with 11
ZDoom · May 15, 2021 · ff27edc · ff27edc
1 parent db8572d
commit ff27edc
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -43,20 +43,20 @@ jobs:
             build_type: "RelWithDebInfo"
           }
         - {
-            name: "Linux GCC 10",
+            name: "Linux GCC 11",
             os: ubuntu-20.04,
-            extra_options: "-DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10",
-            deps_cmdline: "sudo apt update && sudo apt install g++-10 libsdl2-dev libvpx-dev libgtk-3-dev",
+            extra_options: "-DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11",
+            deps_cmdline: "sudo apt update && sudo apt install g++-11 libsdl2-dev libvpx-dev libgtk-3-dev",
             build_type: "MinSizeRel"
           }
-        # - {
-        #     name: "Linux Clang 6",
-        #     os: ubuntu-20.04,
-        #     extra_options: "-DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 \
-        #                     -DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF",
-        #     deps_cmdline: "sudo apt update && sudo apt install clang-6.0 libsdl2-dev libvpx-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev",
-        #     build_type: "Debug"
-        #   }
+        - {
+            name: "Linux Clang 6",
+            os: ubuntu-20.04,
+            extra_options: "-DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 \
+                            -DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF",
+            deps_cmdline: "sudo apt update && sudo apt remove gcc-11 libgcc-11-dev g++-11 libstdc++-11-dev && sudo apt install clang-6.0 libstdc++-9-dev libsdl2-dev libvpx-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev",
+            build_type: "Debug"
+          }
         - {
             name: "Linux Clang 11",
             os: ubuntu-20.04,