Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
8 changes: 1 addition & 7 deletions templates/gsl.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down