diff options
| author | Leitwolf | 2026-10-25 10:31:36 +0300 |
|---|---|---|
| committer | GitHub | 2026-10-25 10:31:36 +0300 |
| commit | d2e3e074bb2e1b8ffd9fc990d0b87667ea602f58 (patch) | |
| tree | 0bce4462b2e190c39b3e1c5f697e3e4abd1a5e2a /.github/workflows | |
| parent | 13f81a480a93807c14dddb5abdb97355ced4d4c5 (diff) | |
| parent | 126dc333564cb72b5115d9a9242d66694694b6d0 (diff) | |
| download | catch3-d2e3e074bb2e1b8ffd9fc990d0b87667ea602f58.tar.gz | |
Merge pull request #18 from Progmasoft/build/catch3-identity
Give Catch3 its own build names and headers
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/linux-builds.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/mac-builds.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/mac-sanitizer-builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/validate-header-guards.yml | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index c6d39cd6..0e398d82 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -40,8 +40,8 @@ jobs: -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ - -DCATCH_BUILD_EXAMPLES=ON \ - -DCATCH_BUILD_EXTRA_TESTS=ON + -DCATCH3_BUILD_EXAMPLES=ON \ + -DCATCH3_BUILD_EXTRA_TESTS=ON - name: Build run: cmake --build build @@ -76,8 +76,8 @@ jobs: -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ - -DCATCH_BUILD_EXAMPLES=ON \ - -DCATCH_BUILD_EXTRA_TESTS=ON + -DCATCH3_BUILD_EXAMPLES=ON \ + -DCATCH3_BUILD_EXTRA_TESTS=ON - name: Build run: cmake --build build diff --git a/.github/workflows/mac-builds.yml b/.github/workflows/mac-builds.yml index 1bf131fb..503492e7 100644 --- a/.github/workflows/mac-builds.yml +++ b/.github/workflows/mac-builds.yml @@ -29,8 +29,8 @@ jobs: cmake --preset basic-tests -GNinja \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ - -DCATCH_BUILD_EXAMPLES=ON \ - -DCATCH_BUILD_EXTRA_TESTS=ON + -DCATCH3_BUILD_EXAMPLES=ON \ + -DCATCH3_BUILD_EXTRA_TESTS=ON - name: Build run: cmake --build build diff --git a/.github/workflows/mac-sanitizer-builds.yml b/.github/workflows/mac-sanitizer-builds.yml index 9aad456c..21de70fb 100644 --- a/.github/workflows/mac-sanitizer-builds.yml +++ b/.github/workflows/mac-sanitizer-builds.yml @@ -40,7 +40,7 @@ jobs: cmake --preset ${{matrix.preset}} -GNinja \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ - -DCATCH_BUILD_EXTRA_TESTS=ON + -DCATCH3_BUILD_EXTRA_TESTS=ON - name: Build run: cmake --build build diff --git a/.github/workflows/validate-header-guards.yml b/.github/workflows/validate-header-guards.yml index 930bbea6..c5f8a35d 100644 --- a/.github/workflows/validate-header-guards.yml +++ b/.github/workflows/validate-header-guards.yml @@ -20,14 +20,14 @@ jobs: uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.12' - - name: Install checkguard - run: python -m pip install --requirement requirements-header-guards.txt - - name: Check that include guards are properly named + # Every header is guarded with #pragma once, as the Progmasoft C++ Style + # asks; the amalgamation script relies on it. + - name: Check that every header starts its guard with pragma once run: | - wrong_files=$(checkguard -r src/catch2/ -p "name | append _INCLUDED | upper") + wrong_files=$(grep -rL --include='*.hpp' '^#pragma once' src/Progmasoft || true) if [[ $wrong_files ]]; then - echo "Files with wrong header guard:" + echo "Headers without #pragma once:" echo $wrong_files exit 1 fi |