mirror of
https://github.com/catchorg/Catch2.git
synced 2025-05-04 22:45:44 +02:00
Use presets in CI
This commit is contained in:
parent
66085dac55
commit
cecb02e68f
22
.github/workflows/linux-other-builds.yml
vendored
22
.github/workflows/linux-other-builds.yml
vendored
@ -82,13 +82,10 @@ jobs:
|
|||||||
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
|
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
|
||||||
# This is important
|
# This is important
|
||||||
run: |
|
run: |
|
||||||
cmake -Bbuild -GNinja \
|
cmake --preset basic-tests -GNinja \
|
||||||
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
|
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
|
||||||
-DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
|
-DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
|
||||||
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
|
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
|
||||||
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
|
|
||||||
-DCMAKE_CXX_EXTENSIONS=OFF \
|
|
||||||
-DCATCH_DEVELOPMENT_BUILD=ON \
|
|
||||||
${{matrix.cmake_configurations}}
|
${{matrix.cmake_configurations}}
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
@ -115,19 +112,16 @@ jobs:
|
|||||||
clangtidy="clang-tidy-15;-use-color"
|
clangtidy="clang-tidy-15;-use-color"
|
||||||
# Use a dummy compiler/linker/ar/ranlib to effectively disable the
|
# Use a dummy compiler/linker/ar/ranlib to effectively disable the
|
||||||
# compilation and only run clang-tidy.
|
# compilation and only run clang-tidy.
|
||||||
cmake -Bbuild -GNinja \
|
cmake --preset basic-tests -GNinja \
|
||||||
-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_AR=/usr/bin/true \
|
||||||
|
-DCMAKE_BUILD_TYPE=Debug \
|
||||||
|
-DCMAKE_CXX_CLANG_TIDY="$clangtidy" \
|
||||||
-DCMAKE_CXX_COMPILER_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_LINK_EXECUTABLE=/usr/bin/true \
|
||||||
|
-DCMAKE_CXX_STANDARD=17 \
|
||||||
|
-DCMAKE_RANLIB=/usr/bin/true \
|
||||||
-DCATCH_BUILD_EXAMPLES=ON \
|
-DCATCH_BUILD_EXAMPLES=ON \
|
||||||
-DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
-DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
||||||
|
|
||||||
|
7
.github/workflows/linux-simple-builds.yml
vendored
7
.github/workflows/linux-simple-builds.yml
vendored
@ -101,13 +101,10 @@ jobs:
|
|||||||
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
|
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
|
||||||
# This is important
|
# This is important
|
||||||
run: |
|
run: |
|
||||||
cmake -Bbuild -GNinja \
|
cmake --preset basic-tests -GNinja \
|
||||||
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
|
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
|
||||||
-DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
|
-DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
|
||||||
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
|
-DCMAKE_CXX_STANDARD=${{matrix.std}}
|
||||||
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
|
|
||||||
-DCMAKE_CXX_EXTENSIONS=OFF \
|
|
||||||
-DCATCH_DEVELOPMENT_BUILD=ON
|
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build build
|
run: cmake --build build
|
||||||
|
4
.github/workflows/mac-builds.yml
vendored
4
.github/workflows/mac-builds.yml
vendored
@ -19,11 +19,9 @@ jobs:
|
|||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
cmake -Bbuild -GNinja \
|
cmake --preset basic-tests -GNinja \
|
||||||
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
|
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
|
||||||
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
|
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
|
||||||
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
|
|
||||||
-DCATCH_DEVELOPMENT_BUILD=ON \
|
|
||||||
-DCATCH_BUILD_EXAMPLES=ON \
|
-DCATCH_BUILD_EXAMPLES=ON \
|
||||||
-DCATCH_BUILD_EXTRA_TESTS=ON
|
-DCATCH_BUILD_EXTRA_TESTS=ON
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user