diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 789c4382..33d95367 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,7 +138,7 @@ jobs: - name: Prepare toolchain [windows] if: ${{ startsWith(matrix.os, 'windows') }} - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v3 - name: Build gsl [macos] if: ${{ startsWith(matrix.os, 'macos') }} diff --git a/templates/gsl.ci.yml b/templates/gsl.ci.yml index b6848f02..04aa1d3a 100644 --- a/templates/gsl.ci.yml +++ b/templates/gsl.ci.yml @@ -725,15 +725,9 @@ endfunction # get_sln_tests . endif . # assert (ndebug) if [[ ${{ matrix.assert }} == 'ndebug' ]]; then -. if defined(my.config.cmake) - echo "ASSERT_NDEBUG=--enable-ndebug -Denable-ndebug=yes" >> $GITHUB_ENV - else - echo "ASSERT_NDEBUG=--disable-ndebug -Denable-ndebug=no" >> $GITHUB_ENV -. else echo "ASSERT_NDEBUG=--enable-ndebug" >> $GITHUB_ENV else echo "ASSERT_NDEBUG=--disable-ndebug" >> $GITHUB_ENV -. endif fi . # link if [[ ${{ matrix.link }} == 'dynamic' ]]; then @@ -936,7 +930,7 @@ endfunction # get_sln_tests steps: - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v2 + uses: microsoft/setup-msbuild@v3 with: msbuild-architecture: x64