diff options
| author | Leitwolf | 2026-10-11 15:47:14 +0300 |
|---|---|---|
| committer | GitHub | 2026-10-11 15:47:14 +0300 |
| commit | 1b3c5f5b43372b6f7ba3be46dc363ebe0f83224e (patch) | |
| tree | 37fb9fec9ee91098fa28646c60c8560449d51842 | |
| parent | ce6fa1996a8e358efdcff53a7628584077d9855c (diff) | |
| parent | 4bb272038a369d01031cbece8536e9baae95fa5b (diff) | |
| download | catch3-1b3c5f5b43372b6f7ba3be46dc363ebe0f83224e.tar.gz | |
Merge pull request #5 from Progmasoft/ci/platforms-like-visual-xsharp
Build on the Visual X# platforms; hand version updates to Renovate
| -rw-r--r-- | .github/dependabot.yml | 18 | ||||
| -rw-r--r-- | .github/renovate.json5 | 50 | ||||
| -rw-r--r-- | .github/workflows/alternative-build-systems.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/bazel-builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux-builds.yml | 86 | ||||
| -rw-r--r-- | .github/workflows/mac-builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/mac-sanitizer-builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/meson-builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/windows-simple-builds.yml | 2 | ||||
| -rw-r--r-- | docs/upstream-status.md | 5 |
10 files changed, 145 insertions, 26 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 6bad227c..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-FileCopyrightText: 2026 Progmasoft <support@progmasoft.com> -# SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-1.1 - -version: 2 -updates: - - package-ecosystem: github-actions - directory: / - schedule: - interval: weekly - - package-ecosystem: bazel - directory: / - schedule: - interval: weekly - - package-ecosystem: pip - directory: / - schedule: - interval: weekly - diff --git a/.github/renovate.json5 b/.github/renovate.json5 new file mode 100644 index 00000000..85ecd13a --- /dev/null +++ b/.github/renovate.json5 @@ -0,0 +1,50 @@ +// SPDX-FileCopyrightText: 2026 Progmasoft <support@progmasoft.com> +// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-1.1 + +// Renovate proposes the version updates of this repository. Dependabot keeps +// its alerts and its security updates, which are repository settings; its +// version updates are off, so that two bots do not open the same pull +// request. +{ + $schema: "https://docs.renovatebot.com/renovate-schema.json", + extends: ["config:recommended", "helpers:pinGitHubActionDigests"], + + // This repository is a fork, which Renovate leaves alone unless it is told + // that the fork is maintained in its own right. + forkProcessing: "enabled", + + timezone: "Europe/Istanbul", + // Once a week, before the working day. + schedule: ["before 6am on monday"], + + // A release is taken a week after it is published: one that turns out to + // be broken or malicious is usually withdrawn within days. + minimumReleaseAge: "7 days", + + // A pull request is rebased when it conflicts, not whenever the default + // branch moves, so that a merge does not start the tests of every open + // update again. + rebaseWhen: "conflicted", + prConcurrentLimit: 2, + prHourlyLimit: 2, + + // The dashboard is an issue, and this repository has issues turned off. + // What is pending shows as pull requests only. + dependencyDashboard: false, + + // Security fixes come from Dependabot security updates. Renovate does not + // open its own for the same advisory. + vulnerabilityAlerts: { enabled: false }, + + ignorePaths: ["third_party/**", "**/node_modules/**"], + + // What Dependabot watched here, and nothing more for now. + enabledManagers: ["github-actions", "bazel-module", "pip_requirements"], + + // One pull request for each kind of dependency. + packageRules: [ + { matchManagers: ["github-actions"], groupName: "GitHub Actions" }, + { matchManagers: ["bazel-module"], groupName: "Bazel modules" }, + { matchManagers: ["pip_requirements"], groupName: "Python tools of CI" }, + ], +} diff --git a/.github/workflows/alternative-build-systems.yml b/.github/workflows/alternative-build-systems.yml index e5e4338f..ebb51d90 100644 --- a/.github/workflows/alternative-build-systems.yml +++ b/.github/workflows/alternative-build-systems.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2025, macos-15] + os: [windows-2025-vs2026, macos-15] steps: - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 diff --git a/.github/workflows/bazel-builds.yml b/.github/workflows/bazel-builds.yml index 5f3b31c7..892145d8 100644 --- a/.github/workflows/bazel-builds.yml +++ b/.github/workflows/bazel-builds.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2025, macos-15] + os: [windows-2025-vs2026, macos-15] steps: - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml new file mode 100644 index 00000000..c6d39cd6 --- /dev/null +++ b/.github/workflows/linux-builds.yml @@ -0,0 +1,86 @@ +name: Linux Builds + +# The Linux hosts are those of the Visual X# compiler, which is the first +# user of this framework: the current Ubuntu LTS, and Fedora in a container. +# Both build with Clang, the compiler that project uses everywhere. + +on: [push, pull_request] + +permissions: + contents: read + +env: + CTEST_OUTPUT_ON_FAILURE: 1 + CTEST_NO_TESTS_ACTION: error + +jobs: + ubuntu: + name: Ubuntu 26.04, C++${{matrix.std}}, ${{matrix.build_type}} + runs-on: ubuntu-26.04 + timeout-minutes: 45 + strategy: + fail-fast: false + matrix: + build_type: [Debug, Release] + std: [14, 17] + + steps: + - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 + with: + persist-credentials: false + + - name: Install Clang, CMake and Ninja + run: | + sudo apt-get update + sudo apt-get install -y clang cmake ninja-build python3 + + - name: Configure + run: | + cmake --preset basic-tests -GNinja \ + -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ + -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_CXX_STANDARD=${{matrix.std}} \ + -DCATCH_BUILD_EXAMPLES=ON \ + -DCATCH_BUILD_EXTRA_TESTS=ON + + - name: Build + run: cmake --build build + + - name: Test + run: ctest --test-dir build -j + + fedora: + name: Fedora 43, C++${{matrix.std}}, ${{matrix.build_type}} + runs-on: ubuntu-26.04 + container: fedora:43 + timeout-minutes: 45 + strategy: + fail-fast: false + matrix: + build_type: [Debug, Release] + std: [14, 17] + + steps: + # Git comes first: without it the checkout falls back to an archive of + # the repository, which is not a checkout the tests can ask questions of. + - name: Install Git, Clang, CMake and Ninja + run: dnf install -y git clang gcc-c++ cmake ninja-build python3 + + - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 + with: + persist-credentials: false + + - name: Configure + run: | + cmake --preset basic-tests -GNinja \ + -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ + -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_CXX_STANDARD=${{matrix.std}} \ + -DCATCH_BUILD_EXAMPLES=ON \ + -DCATCH_BUILD_EXTRA_TESTS=ON + + - name: Build + run: cmake --build build + + - name: Test + run: ctest --test-dir build -j diff --git a/.github/workflows/mac-builds.yml b/.github/workflows/mac-builds.yml index 7162646b..1bf131fb 100644 --- a/.github/workflows/mac-builds.yml +++ b/.github/workflows/mac-builds.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - image: [macos-15, macos-15-intel] + image: [macos-15, macos-26] build_type: [Debug, Release] std: [14, 17] diff --git a/.github/workflows/mac-sanitizer-builds.yml b/.github/workflows/mac-sanitizer-builds.yml index a0265c5d..9aad456c 100644 --- a/.github/workflows/mac-sanitizer-builds.yml +++ b/.github/workflows/mac-sanitizer-builds.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - image: [macos-15, macos-15-intel] + image: [macos-15, macos-26] build_type: [Debug] std: [17] sanitizer: [thread, address] diff --git a/.github/workflows/meson-builds.yml b/.github/workflows/meson-builds.yml index 456f3205..cf72718d 100644 --- a/.github/workflows/meson-builds.yml +++ b/.github/workflows/meson-builds.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2025, macos-15] + os: [windows-2025-vs2026, macos-15] steps: - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 diff --git a/.github/workflows/windows-simple-builds.yml b/.github/workflows/windows-simple-builds.yml index b6174220..18e15b99 100644 --- a/.github/workflows/windows-simple-builds.yml +++ b/.github/workflows/windows-simple-builds.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, windows-2025] + os: [windows-2025-vs2026] platform: [Win32, x64] build_type: [Debug, Release] std: [14, 17] diff --git a/docs/upstream-status.md b/docs/upstream-status.md index ac87b654..0899e31d 100644 --- a/docs/upstream-status.md +++ b/docs/upstream-status.md @@ -41,5 +41,6 @@ also brought it up to date with fork changes it had not yet picked up. No fork-owned file under `src/Progmasoft` needed a change. These are compatibility fixes, not a claim that every future upstream change -is automatically incorporated. The existing Windows/macOS build and test -workflows remain the verification gate for the fork. +is automatically incorporated. The build and test workflows remain the +verification gate for the fork: Windows, macOS 15 and 26, Ubuntu 26.04 and +Fedora 43. |