diff options
| author | Chris Thrasher | 2025-04-27 09:50:02 -0600 |
|---|---|---|
| committer | Chris Thrasher | 2025-04-27 11:08:48 -0600 |
| commit | cecb02e68f701f0e0e6a9e53e9b411907218fd63 (patch) | |
| tree | 91bd49b828373fd32db68ff43e0330ff57ba90cb | |
| parent | 66085dac555c102ec4004cc057e7ef09c81d3c3c (diff) | |
| download | catch3-cecb02e68f701f0e0e6a9e53e9b411907218fd63.tar.gz | |
Use presets in CI
| -rw-r--r-- | .github/workflows/linux-other-builds.yml | 20 | ||||
| -rw-r--r-- | .github/workflows/linux-simple-builds.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/mac-builds.yml | 4 |
3 files changed, 10 insertions, 21 deletions
diff --git a/.github/workflows/linux-other-builds.yml b/.github/workflows/linux-other-builds.yml index 7bc651a8..13882e36 100644 --- a/.github/workflows/linux-other-builds.yml +++ b/.github/workflows/linux-other-builds.yml @@ -82,13 +82,10 @@ jobs: # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}. # This is important run: | - cmake -Bbuild -GNinja \ + cmake --preset basic-tests -GNinja \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_CXX_COMPILER=${{matrix.cxx}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ - -DCMAKE_CXX_STANDARD_REQUIRED=ON \ - -DCMAKE_CXX_EXTENSIONS=OFF \ - -DCATCH_DEVELOPMENT_BUILD=ON \ ${{matrix.cmake_configurations}} - name: Build @@ -115,19 +112,16 @@ jobs: clangtidy="clang-tidy-15;-use-color" # Use a dummy compiler/linker/ar/ranlib to effectively disable the # compilation and only run clang-tidy. - cmake -Bbuild -GNinja \ + cmake --preset basic-tests -GNinja \ + -DCMAKE_AR=/usr/bin/true \ -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_CXX_COMPILER=clang++-15 \ - -DCMAKE_CXX_STANDARD=17 \ - -DCMAKE_CXX_STANDARD_REQUIRED=ON \ - -DCMAKE_CXX_EXTENSIONS=OFF \ - -DCATCH_DEVELOPMENT_BUILD=ON \ -DCMAKE_CXX_CLANG_TIDY="$clangtidy" \ - -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/true \ - -DCMAKE_AR=/usr/bin/true \ -DCMAKE_CXX_COMPILER_AR=/usr/bin/true \ - -DCMAKE_RANLIB=/usr/bin/true \ + -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/true \ + -DCMAKE_CXX_COMPILER=clang++-15 \ -DCMAKE_CXX_LINK_EXECUTABLE=/usr/bin/true \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_RANLIB=/usr/bin/true \ -DCATCH_BUILD_EXAMPLES=ON \ -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON diff --git a/.github/workflows/linux-simple-builds.yml b/.github/workflows/linux-simple-builds.yml index 4e30451e..66220ab3 100644 --- a/.github/workflows/linux-simple-builds.yml +++ b/.github/workflows/linux-simple-builds.yml @@ -101,13 +101,10 @@ jobs: # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}. # This is important run: | - cmake -Bbuild -GNinja \ + cmake --preset basic-tests -GNinja \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_CXX_COMPILER=${{matrix.cxx}} \ - -DCMAKE_CXX_STANDARD=${{matrix.std}} \ - -DCMAKE_CXX_STANDARD_REQUIRED=ON \ - -DCMAKE_CXX_EXTENSIONS=OFF \ - -DCATCH_DEVELOPMENT_BUILD=ON + -DCMAKE_CXX_STANDARD=${{matrix.std}} - name: Build run: cmake --build build diff --git a/.github/workflows/mac-builds.yml b/.github/workflows/mac-builds.yml index 05429a0e..6ac4c2a9 100644 --- a/.github/workflows/mac-builds.yml +++ b/.github/workflows/mac-builds.yml @@ -19,11 +19,9 @@ jobs: - name: Configure run: | - cmake -Bbuild -GNinja \ + cmake --preset basic-tests -GNinja \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ - -DCMAKE_CXX_STANDARD_REQUIRED=ON \ - -DCATCH_DEVELOPMENT_BUILD=ON \ -DCATCH_BUILD_EXAMPLES=ON \ -DCATCH_BUILD_EXTRA_TESTS=ON |