Skip to content

Commit cecb02e

Browse files
committed
Use presets in CI
1 parent 66085da commit cecb02e

File tree

3 files changed

+10
-21
lines changed

3 files changed

+10
-21
lines changed

.github/workflows/linux-other-builds.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,10 @@ jobs:
8282
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
8383
# This is important
8484
run: |
85-
cmake -Bbuild -GNinja \
85+
cmake --preset basic-tests -GNinja \
8686
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
8787
-DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
8888
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
89-
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
90-
-DCMAKE_CXX_EXTENSIONS=OFF \
91-
-DCATCH_DEVELOPMENT_BUILD=ON \
9289
${{matrix.cmake_configurations}}
9390
9491
- name: Build
@@ -115,19 +112,16 @@ jobs:
115112
clangtidy="clang-tidy-15;-use-color"
116113
# Use a dummy compiler/linker/ar/ranlib to effectively disable the
117114
# compilation and only run clang-tidy.
118-
cmake -Bbuild -GNinja \
115+
cmake --preset basic-tests -GNinja \
116+
-DCMAKE_AR=/usr/bin/true \
119117
-DCMAKE_BUILD_TYPE=Debug \
120-
-DCMAKE_CXX_COMPILER=clang++-15 \
121-
-DCMAKE_CXX_STANDARD=17 \
122-
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
123-
-DCMAKE_CXX_EXTENSIONS=OFF \
124-
-DCATCH_DEVELOPMENT_BUILD=ON \
125118
-DCMAKE_CXX_CLANG_TIDY="$clangtidy" \
126-
-DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/true \
127-
-DCMAKE_AR=/usr/bin/true \
128119
-DCMAKE_CXX_COMPILER_AR=/usr/bin/true \
129-
-DCMAKE_RANLIB=/usr/bin/true \
120+
-DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/true \
121+
-DCMAKE_CXX_COMPILER=clang++-15 \
130122
-DCMAKE_CXX_LINK_EXECUTABLE=/usr/bin/true \
123+
-DCMAKE_CXX_STANDARD=17 \
124+
-DCMAKE_RANLIB=/usr/bin/true \
131125
-DCATCH_BUILD_EXAMPLES=ON \
132126
-DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
133127

.github/workflows/linux-simple-builds.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,10 @@ jobs:
101101
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
102102
# This is important
103103
run: |
104-
cmake -Bbuild -GNinja \
104+
cmake --preset basic-tests -GNinja \
105105
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
106106
-DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
107-
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
108-
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
109-
-DCMAKE_CXX_EXTENSIONS=OFF \
110-
-DCATCH_DEVELOPMENT_BUILD=ON
107+
-DCMAKE_CXX_STANDARD=${{matrix.std}}
111108
112109
- name: Build
113110
run: cmake --build build

.github/workflows/mac-builds.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@ jobs:
1919

2020
- name: Configure
2121
run: |
22-
cmake -Bbuild -GNinja \
22+
cmake --preset basic-tests -GNinja \
2323
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
2424
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
25-
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
26-
-DCATCH_DEVELOPMENT_BUILD=ON \
2725
-DCATCH_BUILD_EXAMPLES=ON \
2826
-DCATCH_BUILD_EXTRA_TESTS=ON
2927

0 commit comments

Comments
 (0)