From e7663fe9fd6e609f44c2e5cefc592ff97f7e3c53 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 30 Sep 2024 20:03:10 +0200 Subject: [PATCH] ci: MSVC enabled on CMake CI --- .github/workflows/ci-test-package-cmake.yml | 28 +++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index 979ed1be..819bdc68 100644 --- 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: |