From 4fba8a4300e61b7fc052baf15afa3eec00cea7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johel=20Ernesto=20Guerrero=20Pe=C3=B1a?= Date: Tue, 26 Sep 2023 14:24:56 -0400 Subject: [PATCH] ci: test modules with Clang 17 --- .github/workflows/ci-conan.yml | 13 +++++++------ conanfile.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index e14b1dd95..53716076b 100644 --- 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 index 78282eaca..bbb109d7d 100644 --- 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)