Merge pull request #1258 from UniStuttgart-VISUS/ci

Update CI compiler versions
UniStuttgart-VISUS · Jul 9, 2024 · 8e85c11 · 8e85c11
2 parents 30d1a8d + 34a09ff
commit 8e85c11
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/vcpkg_cache.yml b/.github/workflows/vcpkg_cache.yml
@@ -38,10 +38,10 @@ jobs:
       matrix:
         docker_image: [megamol_ci_ubuntu]
         compiler:
-          - cc: clang-14
-            cxx: clang++-14
-          - cc: gcc-11
-            cxx: g++-11
+          - cc: clang-18
+            cxx: clang++-18
+          - cc: gcc-13
+            cxx: g++-13
         opengl: [ON, OFF]
     name: "${{ matrix.docker_image }} (${{ matrix.compiler.cc }}, OpenGL-${{ matrix.opengl }})"
     runs-on: ubuntu-22.04

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -75,40 +75,40 @@ jobs:
   strategy:
     matrix:
       ## Temporarily disabled until more CI machines are available!
-      #'GCC11 / Make / Release':
+      #'GCC13 / Make / Release':
       #  dockerImage: megamol_ci_ubuntu
-      #  cCompiler: gcc-11
-      #  cxxCompiler: g++-11
+      #  cCompiler: gcc-13
+      #  cxxCompiler: g++-13
       #  configuration: Release
       #  generator: 'Unix Makefiles'
       #  cmakeExtraArgs: '$(defaultConfig)'
-      'GCC11 / Make / Debug':
+      'GCC13 / Make / Debug':
         dockerImage: megamol_ci_ubuntu
-        cCompiler: gcc-11
-        cxxCompiler: g++-11
+        cCompiler: gcc-13
+        cxxCompiler: g++-13
         configuration: Debug
         generator: 'Unix Makefiles'
         cmakeExtraArgs: '$(defaultConfig)'
       ## Temporarily disabled until more CI machines are available!
-      #'GCC11 / Ninja / Release':
+      #'GCC13 / Ninja / Release':
       #  dockerImage: megamol_ci_ubuntu
-      #  cCompiler: gcc-11
-      #  cxxCompiler: g++-11
+      #  cCompiler: gcc-13
+      #  cxxCompiler: g++-13
       #  configuration: Release
       #  generator: 'Ninja'
       #  cmakeExtraArgs: '$(defaultConfig)'
       ## Temporarily changed to Ninja instead of Make until more CI machines are available!
-      'Clang14 / Ninja / Release':
+      'Clang18 / Ninja / Release':
         dockerImage: megamol_ci_ubuntu
-        cCompiler: clang-14
-        cxxCompiler: clang++-14
+        cCompiler: clang-18
+        cxxCompiler: clang++-18
         configuration: Release
         generator: 'Ninja'
         cmakeExtraArgs: '$(defaultConfig)'
-      'GCC11 / Ninja / Release (nonGL)':
+      'GCC13 / Ninja / Release (nonGL)':
         dockerImage: megamol_ci_ubuntu
-        cCompiler: gcc-11
-        cxxCompiler: g++-11
+        cCompiler: gcc-13
+        cxxCompiler: g++-13
         configuration: Release
         generator: 'Ninja'
         cmakeExtraArgs: '$(nonGlConfig)'