From 90e1f5ca948d6343164a229559c6328f2d3a1e78 Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Fri, 14 Nov 2025 09:21:40 +0000 Subject: [PATCH 1/8] Ensure backwards compatability for CMake 4 --- .github/workflows/cmake.yml | 1 + .github/workflows/code_coverage.yml | 1 + .github/workflows/documentation.yml | 1 + .github/workflows/iwyu.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 45a017bb0..4d4dff103 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -253,6 +253,7 @@ jobs: fi echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_defines="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf if [[ "${{ matrix.settings.os }}" != "windows-latest" ]]; then diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 471032321..41dadf267 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -118,6 +118,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_defines="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index d9cbd68b4..c72d4997b 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -86,6 +86,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_defines="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index b4517cffb..3a5f65e3d 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -100,6 +100,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default cat >> .conan2/global.conf < Date: Fri, 14 Nov 2025 09:26:02 +0000 Subject: [PATCH 2/8] Use correct config option --- .github/workflows/cmake.yml | 2 +- .github/workflows/code_coverage.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/iwyu.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 4d4dff103..534623e5d 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -253,7 +253,7 @@ jobs: fi echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_defines="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:definitions="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf if [[ "${{ matrix.settings.os }}" != "windows-latest" ]]; then diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 41dadf267..472a04534 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -118,7 +118,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_defines="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:definitions="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index c72d4997b..34b5ba9a2 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -86,7 +86,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_defines="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:definitions="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 3a5f65e3d..cee3d81e3 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -100,7 +100,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default cat >> .conan2/global.conf < Date: Fri, 14 Nov 2025 09:32:44 +0000 Subject: [PATCH 3/8] Try extra_variables --- .github/workflows/cmake.yml | 2 +- .github/workflows/code_coverage.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/iwyu.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 534623e5d..f010ddcc2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -253,7 +253,7 @@ jobs: fi echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:definitions="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf if [[ "${{ matrix.settings.os }}" != "windows-latest" ]]; then diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 472a04534..995af7b81 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -118,7 +118,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:definitions="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 34b5ba9a2..5fa78d18f 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -86,7 +86,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:definitions="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index cee3d81e3..0f3c5772f 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -100,7 +100,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default cat >> .conan2/global.conf < Date: Fri, 14 Nov 2025 10:09:53 +0000 Subject: [PATCH 4/8] Use dictionary format --- .github/workflows/cmake.yml | 2 +- .github/workflows/code_coverage.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/iwyu.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f010ddcc2..090296f4f 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -253,7 +253,7 @@ jobs: fi echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables.CMAKE_POLICY_VERSION_MINIMUM=3.5' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf if [[ "${{ matrix.settings.os }}" != "windows-latest" ]]; then diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 995af7b81..d7cbb802f 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -118,7 +118,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables.CMAKE_POLICY_VERSION_MINIMUM=3.5' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 5fa78d18f..561367964 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -86,7 +86,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables="CMAKE_POLICY_VERSION_MINIMUM=3.5"' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables.CMAKE_POLICY_VERSION_MINIMUM=3.5' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 0f3c5772f..dd725abed 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -100,7 +100,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default cat >> .conan2/global.conf < Date: Fri, 14 Nov 2025 10:12:06 +0000 Subject: [PATCH 5/8] Apparently this must be lowercase --- .github/workflows/cmake.yml | 2 +- .github/workflows/code_coverage.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/iwyu.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 090296f4f..ae6949240 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -253,7 +253,7 @@ jobs: fi echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables.CMAKE_POLICY_VERSION_MINIMUM=3.5' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables.cmake_policy_version_minimum=3.5' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf if [[ "${{ matrix.settings.os }}" != "windows-latest" ]]; then diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index d7cbb802f..74bfe4dd9 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -118,7 +118,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables.CMAKE_POLICY_VERSION_MINIMUM=3.5' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables.cmake_policy_version_minimum=3.5' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 561367964..6c5eee34b 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -86,7 +86,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables.CMAKE_POLICY_VERSION_MINIMUM=3.5' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables.cmake_policy_version_minimum=3.5' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index dd725abed..1f520c292 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -100,7 +100,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default cat >> .conan2/global.conf < Date: Fri, 14 Nov 2025 10:18:09 +0000 Subject: [PATCH 6/8] Try a different dictionary format --- .github/workflows/cmake.yml | 2 +- .github/workflows/code_coverage.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/iwyu.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ae6949240..914bc4060 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -253,7 +253,7 @@ jobs: fi echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables.cmake_policy_version_minimum=3.5' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables = {"cmake_policy_version_minimum": "3.5"}' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf if [[ "${{ matrix.settings.os }}" != "windows-latest" ]]; then diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 74bfe4dd9..809b2fe39 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -118,7 +118,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables.cmake_policy_version_minimum=3.5' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables = {"cmake_policy_version_minimum": "3.5"}' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 6c5eee34b..bae2a857a 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -86,7 +86,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables.cmake_policy_version_minimum=3.5' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables = {"cmake_policy_version_minimum": "3.5"}' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 1f520c292..13b22a9f1 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -100,7 +100,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default cat >> .conan2/global.conf < Date: Fri, 14 Nov 2025 10:21:36 +0000 Subject: [PATCH 7/8] Use uppercase after all --- .github/workflows/cmake.yml | 2 +- .github/workflows/code_coverage.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/iwyu.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 914bc4060..8ed5880b6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -253,7 +253,7 @@ jobs: fi echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables = {"cmake_policy_version_minimum": "3.5"}' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables = {"CMAKE_POLICY_VERSION_MINIMUM": "3.5"}' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf if [[ "${{ matrix.settings.os }}" != "windows-latest" ]]; then diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 809b2fe39..6cf66c1cf 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -118,7 +118,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables = {"cmake_policy_version_minimum": "3.5"}' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables = {"CMAKE_POLICY_VERSION_MINIMUM": "3.5"}' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index bae2a857a..9089c950b 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -86,7 +86,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables = {"cmake_policy_version_minimum": "3.5"}' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:extra_variables = {"CMAKE_POLICY_VERSION_MINIMUM": "3.5"}' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 13b22a9f1..eb3e522c5 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -100,7 +100,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default cat >> .conan2/global.conf < Date: Fri, 14 Nov 2025 10:25:48 +0000 Subject: [PATCH 8/8] Use configure args as value must be present before the toolchain --- .github/workflows/cmake.yml | 2 +- .github/workflows/code_coverage.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/iwyu.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8ed5880b6..8cba815a6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -253,7 +253,7 @@ jobs: fi echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables = {"CMAKE_POLICY_VERSION_MINIMUM": "3.5"}' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:configure_args = {"CMAKE_POLICY_VERSION_MINIMUM": "3.5"}' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf if [[ "${{ matrix.settings.os }}" != "windows-latest" ]]; then diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 6cf66c1cf..ea273c5eb 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -118,7 +118,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables = {"CMAKE_POLICY_VERSION_MINIMUM": "3.5"}' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:configure_args = {"CMAKE_POLICY_VERSION_MINIMUM": "3.5"}' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 9089c950b..df3bc7c1f 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -86,7 +86,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default echo 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' >> .conan2/global.conf - echo 'tools.cmake.cmaketoolchain:extra_variables = {"CMAKE_POLICY_VERSION_MINIMUM": "3.5"}' >> .conan2/global.conf + echo 'tools.cmake.cmaketoolchain:configure_args = {"CMAKE_POLICY_VERSION_MINIMUM": "3.5"}' >> .conan2/global.conf echo "tools.cmake.cmaketoolchain:generator = Ninja Multi-Config" >> .conan2/global.conf echo "tools.system.package_manager:mode = install" >> .conan2/global.conf echo "tools.system.package_manager:sudo = True" >> .conan2/global.conf diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index eb3e522c5..50dfc4ae7 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -100,7 +100,7 @@ jobs: sed -i.backup '1a mold*:compiler.libcxx=libstdc++11' .conan2/profiles/default cat >> .conan2/global.conf <