ci: MSVC enabled on CMake CI

mpusz · Sep 30, 2024 · e7663fe · e7663fe
1 parent a9fc203
commit e7663fe
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml
@@ -45,16 +45,13 @@ 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: "" },
-          #   }
-          # - {
-          #     name: "MSVC 14.3",
-          #     os: windows-2022,
-          #     compiler: { type: MSVC, version: 193, cc: "", cxx: "" },
-          #   }
+          - {
+              name: "MSVC 14.4",
+              os: windows-2022,
+              compiler: { type: MSVC, version: 194, cc: "", cxx: "" },
+              cxx_modules: "False",
+              std_format_support: "True",
+            }
           - {
               name: "GCC-12",
               os: ubuntu-24.04,
@@ -179,7 +176,9 @@ jobs:
         with:
           string: ${{ matrix.build_type }}
       - uses: actions/checkout@v4
-      - run: echo "cache_id=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_ENV
+      - name: Generate unique cache id
+        shell: bash
+        run: echo "cache_id=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_ENV
       - name: Cache Conan data
         uses: actions/cache@v4
         if: always()
@@ -249,8 +248,11 @@ jobs:
           sed -i.backup '/^\[settings\]$/,/^\[/ s/^compiler.cppstd=.*/compiler.cppstd=${{ matrix.std }}/' ~/.conan2/profiles/default
           sed -i.backup '/^\[settings\]$/,/^\[/ s/^build_type=.*/build_type=${{ matrix.build_type }}/' ~/.conan2/profiles/default
           conan profile show -pr default
-      - 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: Set 'std_format' and 'import_std' environment variables
+        shell: bash
+        run: |
+            echo "std_format=$([ "${{ matrix.formatting }}" == "std::format" ] && echo "True" || echo "False")" >> $GITHUB_ENV
+            echo "import_std=$([ "${{ matrix.config.cxx_modules }}" == "True" ] && [ "${{ matrix.config.contracts }}" == "none" ] && [ "${{ matrix.formatting }}" == "std::format" ] && echo "True" || echo "False")" >> $GITHUB_ENV
       - name: Install Conan dependencies
         shell: bash
         run: |