From cc043360d5c61b1da025580b499baddaed432471 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Mon, 30 Sep 2024 19:07:37 +0200
Subject: [PATCH] ci: MSVC added to the CI

---
 .github/workflows/ci-conan.yml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
index 380bbae5..d964c0fe 100644
--- a/.github/workflows/ci-conan.yml
+++ b/.github/workflows/ci-conan.yml
@@ -44,18 +44,14 @@ jobs:
         contracts: ["none", "gsl-lite", "ms-gsl"]
         std: [20, 23]
         config:
-          # - {
-          #     name: "MSVC 14.2",
-          #     os: windows-2019,
-          #     compiler: { type: VISUAL, version: 16, cc: "", cxx: "" },
-          #     conan-config: "-c user.mp-units.build:skip_la=True",
-          #   }
-          # - {
-          #     name: "MSVC 14.3",
-          #     os: windows-2022,
-          #     compiler: { type: MSVC, version: 193, cc: "", cxx: "" },
-          #     conan-config: "",
-          #   }
+          - {
+              name: "MSVC 14.4",
+              os: windows-2022,
+              compiler: { type: MSVC, version: 194, cc: "", cxx: "" },
+              cxx_modules: "False",
+              std_format_support: "True",
+              conan-config: "",
+            }
           - {
               name: "GCC-12",
               os: ubuntu-24.04,
@@ -259,11 +255,19 @@ jobs:
       - run: echo "std_format=$([ "${{ matrix.formatting }}" == "std::format" ] && echo "True" || echo "False")" >> $GITHUB_ENV
       - run: echo "import_std=$([ "${{ matrix.config.cxx_modules }}" == "True" ] && [ "${{ matrix.config.contracts }}" == "none" ] && [ "${{ matrix.formatting }}" == "std::format" ] && echo "True" || echo "False")" >> $GITHUB_ENV
       - name: Create Conan package
+        if: matrix.config.compiler.type != 'MSVC'
         shell: bash
         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 '&:import_std=${{ env.import_std }}' -o '&:std_format=${{ env.std_format }}' -o '&:contracts=${{ matrix.contracts }}' ${{ matrix.config.conan-config }}
+      - name: Create Conan package
+        if: matrix.config.compiler.type == 'MSVC'
+        shell: bash
+        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=False \
+                         -o '&:cxx_modules=${{ matrix.config.cxx_modules }}' -o '&:import_std=${{ env.import_std }}' -o '&:std_format=${{ env.std_format }}' -o '&:contracts=${{ matrix.contracts }}' ${{ matrix.config.conan-config }}
       - name: Obtain package reference
         id: get-package-ref
         shell: bash