Merge branch 'master' into actions

UniStuttgart-VISUS · Jul 9, 2024 · b25390f · b25390f
2 parents 049f76d + 8e85c11
commit b25390f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml
@@ -39,10 +39,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
@@ -71,22 +71,22 @@ jobs:
 
   strategy:
     matrix:
-      'GCC11 / Debug':
+      'GCC13 / Debug':
         dockerImage: megamol_ci_ubuntu
-        cCompiler: gcc-11
-        cxxCompiler: g++-11
+        cCompiler: gcc-13
+        cxxCompiler: g++-13
         configuration: Debug
         cmakeExtraArgs: '$(defaultConfig)'
-      'Clang14 / Release':
+      'Clang18 / Release':
         dockerImage: megamol_ci_ubuntu
-        cCompiler: clang-14
-        cxxCompiler: clang++-14
+        cCompiler: clang-18
+        cxxCompiler: clang++-18
         configuration: Release
         cmakeExtraArgs: '$(defaultConfig)'
-      'GCC11 / Release (nonGL)':
+      'GCC13 / Release (nonGL)':
         dockerImage: megamol_ci_ubuntu
-        cCompiler: gcc-11
-        cxxCompiler: g++-11
+        cCompiler: gcc-13
+        cxxCompiler: g++-13
         configuration: Release
         cmakeExtraArgs: '$(nonGlConfig)'