From 1fc2b1507bc4cd63a364123a9add89b3f48c731e Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Thu, 20 Jun 2024 14:51:16 +0200
Subject: [PATCH] ci: CI scripts updated to use new spelling for Conan options

---
 .github/workflows/ci-clang-tidy.yml         | 2 +-
 .github/workflows/ci-conan.yml              | 2 +-
 .github/workflows/ci-freestanding.yml       | 2 +-
 .github/workflows/ci-test-package-cmake.yml | 2 +-
 .github/workflows/codeql.yml                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-clang-tidy.yml b/.github/workflows/ci-clang-tidy.yml
index 9f4e6a5e..80e5edbd 100644
--- a/.github/workflows/ci-clang-tidy.yml
+++ b/.github/workflows/ci-clang-tidy.yml
@@ -129,7 +129,7 @@ jobs:
         run: |
           conan build . -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" \
                         -c user.mp-units.build:all=True -c user.mp-units.analyze:clang-tidy=True \
-                        -o cxx_modules=${{ matrix.config.cxx_modules }} -o std_format=${{ env.std_format }} -o contracts=${{ matrix.contracts }} ${{ matrix.config.conan-config }}
+                        '-o &:cxx_modules=${{ matrix.config.cxx_modules }}' -o '&:std_format=${{ env.std_format }}' -o '&:contracts=${{ matrix.contracts }}' ${{ matrix.config.conan-config }}
       - name: Clean Conan cache before backup
         shell: bash
         run: |
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
index 44bdf8e4..93241774 100644
--- a/.github/workflows/ci-conan.yml
+++ b/.github/workflows/ci-conan.yml
@@ -243,7 +243,7 @@ jobs:
         run: |
           conan create . --user mpusz --channel ${CHANNEL} --lockfile-out=package.lock \
                          -b mp-units/* -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" \
-                         -c user.mp-units.build:all=True -o cxx_modules=${{ matrix.config.cxx_modules }} -o std_format=${{ env.std_format }} -o contracts=${{ matrix.contracts }} ${{ matrix.config.conan-config }}
+                         -c user.mp-units.build:all=True -o '&:cxx_modules=${{ matrix.config.cxx_modules }}' -o '&:std_format=${{ env.std_format }}' -o '&:contracts=${{ matrix.contracts }}' ${{ matrix.config.conan-config }}
       - name: Obtain package reference
         id: get-package-ref
         shell: bash
diff --git a/.github/workflows/ci-freestanding.yml b/.github/workflows/ci-freestanding.yml
index 407949d3..0b6918bf 100644
--- a/.github/workflows/ci-freestanding.yml
+++ b/.github/workflows/ci-freestanding.yml
@@ -147,7 +147,7 @@ jobs:
         run: |
           conan build . -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" \
                         -c user.mp-units.build:all=True -c tools.build:cxxflags="['-ffreestanding']" \
-                        -o cxx_modules=${{ matrix.config.cxx_modules }} -o std_format=${{ env.std_format }} -o contracts=${{ matrix.contracts }} -o freestanding=True ${{ matrix.config.conan-config }}
+                        -o '&:cxx_modules=${{ matrix.config.cxx_modules }}' -o '&:std_format=${{ env.std_format }}' -o '&:contracts=${{ matrix.contracts }}' -o '&:freestanding=True' ${{ matrix.config.conan-config }}
       - name: Clean Conan cache before backup
         shell: bash
         run: |
diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml
index 024ad0ac..4b3cacec 100644
--- a/.github/workflows/ci-test-package-cmake.yml
+++ b/.github/workflows/ci-test-package-cmake.yml
@@ -235,7 +235,7 @@ jobs:
         shell: bash
         run: |
           conan install . -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" -c user.mp-units.build:all=False \
-                          -o cxx_modules=${{ matrix.config.cxx_modules }} -o std_format=${{ env.std_format }} -o contracts=${{ matrix.contracts }}
+                          -o '&:cxx_modules=${{ matrix.config.cxx_modules }}' -o '&:std_format=${{ env.std_format }}' -o '&:contracts=${{ matrix.contracts }}'
       - name: Provide dependencies for the build
         shell: bash
         working-directory: src
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 072cb7e9..c7e0abb5 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -105,7 +105,7 @@ jobs:
         conan profile detect --force
         conan remote add artifactory https://mpusz.jfrog.io/artifactory/api/conan/conan-oss
         mkdir _lgtm_build_dir && cd _lgtm_build_dir
-        conan build .. -s compiler.cppstd=20 -c user.mp-units.build:all=True -o std_format=False -b missing
+        conan build .. -s compiler.cppstd=20 -c user.mp-units.build:all=True -o '&:std_format=False' -b missing
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3