ci: test modules with Clang 17

mpusz · Sep 26, 2023 · 4fba8a4 · 4fba8a4
1 parent ab01f5a
commit 4fba8a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
@@ -111,22 +111,22 @@ jobs:
               modules: "False",
             }
           - {
-              name: "Ubuntu Clang-16 + libc++ (modules)",
+              name: "Ubuntu Clang-17 + libc++",
               os: ubuntu-22.04,
               compiler:
                 {
                   type: CLANG,
-                  version: 16,
-                  cc: "clang-16",
-                  cxx: "clang++-16",
+                  version: 17,
+                  cc: "clang-17",
+                  cxx: "clang++-17",
                   std: 20,
                 },
               lib: "libc++",
               conan-config: "",
-              modules: "True",
+              modules: "False",
             }
           - {
-              name: "Ubuntu Clang-17 + libc++",
+              name: "Ubuntu Clang-17 + libc++ (modules)",
               os: ubuntu-22.04,
               compiler:
                 {
@@ -138,6 +138,7 @@ jobs:
                 },
               lib: "libc++",
               conan-config: "",
+              modules: "True",
             }
           # - {
           #     name: "MacOS Apple Clang 13",

diff --git a/conanfile.py b/conanfile.py
@@ -140,7 +140,7 @@ def generate(self):
         tc.variables["MP_UNITS_BUILD_LA"] = self._build_all and not self._skip_la
         tc.variables["MP_UNITS_USE_LIBFMT"] = self._use_libfmt
         if self._build_modules:
-            tc.variables["CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS"] = "/usr/bin/clang-scan-deps-16"
+            tc.variables["CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS"] = "/usr/bin/clang-scan-deps-17"
             tc.variables["CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API"] = "aa1f7df0-828a-4fcd-9afc-2dc80491aca7"
         tc.generate()
         deps = CMakeDeps(self)