From e41187878bc55869cb4296ace1b7f42172a66849 Mon Sep 17 00:00:00 2001 From: Edward Nolan Date: Sat, 24 Aug 2024 13:54:36 -0400 Subject: [PATCH] make ci script params more flexible --- .github/workflows/ci.yml | 4 ++-- ci.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4586b09..3885475 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: submodules: recursive - name: Run run: | - ./ci.sh -fsanitize=address -fsanitize=undefined -fsanitize-undefined-trap-on-error + ./ci.sh -DCMAKE_CXX_FLAGS='-fsanitize=address -fsanitize=undefined -fsanitize-undefined-trap-on-error' clang-linux: runs-on: ubuntu-latest container: @@ -32,7 +32,7 @@ jobs: submodules: recursive - name: Run run: | - ./ci.sh -fsanitize=address -fsanitize=undefined -fsanitize-undefined-trap-on-error -stdlib=libc++ + ./ci.sh -DCMAKE_CXX_FLAGS='-fsanitize=address -fsanitize=undefined -fsanitize-undefined-trap-on-error -stdlib=libc++' msvc-windows: runs-on: windows-latest steps: diff --git a/ci.sh b/ci.sh index c147fe4..9f93c90 100755 --- a/ci.sh +++ b/ci.sh @@ -7,7 +7,7 @@ function main() { local checkout="$PWD" mkdir "$checkout/build" cd "$checkout/build" - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=23 -DBUILD_TESTING=On -DCMAKE_CXX_FLAGS="${cxx_flags[*]}" + cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=23 -DBUILD_TESTING=On "$@" cmake --build . --parallel ctest -C Debug }