diff options
author | Yang Liu <[email protected]> | 2023-12-31 14:00:46 +0800 |
---|---|---|
committer | Yang Liu <[email protected]> | 2023-12-31 14:00:46 +0800 |
commit | b372dc61573968515df527b78f6aaf44997c513f (patch) | |
tree | 98b2132e947ff1706ed0567e9a1ac99b0deaafe6 /externals/catch/.github | |
parent | 3fc44ea16e89b3e762528f8c715bb34d7c195aef (diff) | |
parent | ba06a404d1437c73ed3ba100d04a217fa69545b8 (diff) | |
download | dynarmic-b372dc61573968515df527b78f6aaf44997c513f.tar.gz dynarmic-b372dc61573968515df527b78f6aaf44997c513f.zip |
externals: Update catch2 to v3.5.0
Merge commit 'ba06a404d1437c73ed3ba100d04a217fa69545b8'
Diffstat (limited to 'externals/catch/.github')
7 files changed, 58 insertions, 16 deletions
diff --git a/externals/catch/.github/workflows/linux-bazel-builds.yml b/externals/catch/.github/workflows/linux-bazel-builds.yml index 9006652e..dc826ac0 100644 --- a/externals/catch/.github/workflows/linux-bazel-builds.yml +++ b/externals/catch/.github/workflows/linux-bazel-builds.yml @@ -11,7 +11,7 @@ jobs: compilation_mode: [fastbuild, dbg, opt] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Mount bazel cache uses: actions/cache@v3 diff --git a/externals/catch/.github/workflows/linux-meson-builds.yml b/externals/catch/.github/workflows/linux-meson-builds.yml index dec701b6..4ffa0243 100644 --- a/externals/catch/.github/workflows/linux-meson-builds.yml +++ b/externals/catch/.github/workflows/linux-meson-builds.yml @@ -18,10 +18,12 @@ jobs: other_pkgs: clang-11 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Prepare environment - run: sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}} + run: | + sudo apt-get update + sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}} - name: Configure build env: diff --git a/externals/catch/.github/workflows/linux-other-builds.yml b/externals/catch/.github/workflows/linux-other-builds.yml index cf4e2c06..4a7f5ecc 100644 --- a/externals/catch/.github/workflows/linux-other-builds.yml +++ b/externals/catch/.github/workflows/linux-other-builds.yml @@ -29,13 +29,13 @@ jobs: build_type: Debug std: 14 other_pkgs: g++-7 - cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON + cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON - cxx: g++-7 build_description: Extras + Examples build_type: Release std: 14 other_pkgs: g++-7 - cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON + cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON # Extras and examples with Clang-10 - cxx: clang++-10 @@ -43,13 +43,13 @@ jobs: build_type: Debug std: 17 other_pkgs: clang-10 - cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON + cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON - cxx: clang++-10 build_description: Extras + Examples build_type: Release std: 17 other_pkgs: clang-10 - cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON + cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON # Configure tests with Clang-10 - cxx: clang++-10 @@ -70,10 +70,12 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Prepare environment - run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}} + run: | + sudo apt-get update + sudo apt-get install -y ninja-build ${{matrix.other_pkgs}} - name: Configure build working-directory: ${{runner.workspace}} diff --git a/externals/catch/.github/workflows/linux-simple-builds.yml b/externals/catch/.github/workflows/linux-simple-builds.yml index 989c4942..a32eb597 100644 --- a/externals/catch/.github/workflows/linux-simple-builds.yml +++ b/externals/catch/.github/workflows/linux-simple-builds.yml @@ -83,7 +83,7 @@ jobs: other_pkgs: g++-10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Add repositories for older GCC run: | @@ -92,7 +92,9 @@ jobs: if: ${{ matrix.cxx == 'g++-5' || matrix.cxx == 'g++-6' }} - name: Prepare environment - run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}} + run: | + sudo apt-get update + sudo apt-get install -y ninja-build ${{matrix.other_pkgs}} - name: Configure build working-directory: ${{runner.workspace}} diff --git a/externals/catch/.github/workflows/mac-builds.yml b/externals/catch/.github/workflows/mac-builds.yml index 955b81fc..259d8b36 100644 --- a/externals/catch/.github/workflows/mac-builds.yml +++ b/externals/catch/.github/workflows/mac-builds.yml @@ -22,7 +22,7 @@ jobs: extra_tests: ON steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Configure build working-directory: ${{runner.workspace}} @@ -42,11 +42,10 @@ jobs: - name: Build tests + lib working-directory: ${{runner.workspace}}/build - run: make -j 2 + run: make -j `sysctl -n hw.ncpu` - name: Run tests env: CTEST_OUTPUT_ON_FAILURE: 1 working-directory: ${{runner.workspace}}/build - # Hardcode 2 cores we know are there - run: ctest -C ${{matrix.build_type}} -j 2 + run: ctest -C ${{matrix.build_type}} -j `sysctl -n hw.ncpu` diff --git a/externals/catch/.github/workflows/validate-header-guards.yml b/externals/catch/.github/workflows/validate-header-guards.yml index c02b5d49..fa9d1574 100644 --- a/externals/catch/.github/workflows/validate-header-guards.yml +++ b/externals/catch/.github/workflows/validate-header-guards.yml @@ -9,7 +9,7 @@ jobs: steps: - name: Checkout source code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Dependencies uses: actions/setup-python@v2 diff --git a/externals/catch/.github/workflows/windows-simple-builds.yml b/externals/catch/.github/workflows/windows-simple-builds.yml new file mode 100644 index 00000000..5fb7b8fe --- /dev/null +++ b/externals/catch/.github/workflows/windows-simple-builds.yml @@ -0,0 +1,37 @@ +name: Windows builds (basic) + +on: [push, pull_request] + +jobs: + build: + name: ${{matrix.os}}, ${{matrix.std}}, ${{matrix.build_type}}, ${{matrix.platform}} + runs-on: ${{matrix.os}} + strategy: + matrix: + os: [windows-2019, windows-2022] + platform: [Win32, x64] + build_type: [Debug, Release] + std: [14, 17] + steps: + - uses: actions/checkout@v4 + + - name: Configure build + working-directory: ${{runner.workspace}} + run: | + cmake -S $Env:GITHUB_WORKSPACE ` + -B ${{runner.workspace}}/build ` + -DCMAKE_CXX_STANDARD=${{matrix.std}} ` + -A ${{matrix.platform}} ` + --preset all-tests + + - name: Build tests + working-directory: ${{runner.workspace}} + run: cmake --build build --config ${{matrix.build_type}} --parallel %NUMBER_OF_PROCESSORS% + shell: cmd + + - name: Run tests + working-directory: ${{runner.workspace}}/build + env: + CTEST_OUTPUT_ON_FAILURE: 1 + run: ctest -C ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS% + shell: cmd |