catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Name the Bazel targets of the tools in snake_case
- Commit
e32c9d107274f42b9cca700475404c80e96533c5- Author
- Leitwolf11 ·
- Parents
da3c9d0880db
Changes
.github/renovate.json5 | 2 +- .github/workflows/validate-header-guards.yml | 2 +- MODULE.bazel | 2 +- docs/contributing.md | 6 +++--- tools/BUILD.bazel | 6 +++--- tools/ReleaseNotesMain.cpp | 4 ++-- tools/RepoInfoMain.cpp | 4 ++-- tools/ThirdPartyMain.cpp | 8 ++++---- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index b1accb38..deaa4062 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -48,7 +48,7 @@ // third_party/ holds copies of release archives, which MODULE.bazel pins by // version and sha256. Renovate changes the version; the pull request then - // needs the new digest and //tools:third-party -- --update, which the + // needs the new digest and //tools:third_party -- --update, which the // third_party check of CI asks for. customManagers: [ { diff --git a/.github/workflows/validate-header-guards.yml b/.github/workflows/validate-header-guards.yml index 41a4b0a4..bceb79ae 100644 --- a/.github/workflows/validate-header-guards.yml +++ b/.github/workflows/validate-header-guards.yml @@ -36,6 +36,6 @@ jobs: # third_party/ must be the pinned release archives, byte for byte. - name: Check that third_party matches its pinned archives - run: bazel run //tools:third-party -- --check + run: bazel run //tools:third_party -- --check env: CC: clang diff --git a/MODULE.bazel b/MODULE.bazel index 1fbd7f52..cba2b4e7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -7,7 +7,7 @@ bazel_dep(name = "platforms", version = "1.0.0") # The archives third_party/ holds copies of. Renovate changes a version; the # pull request then needs the digest of the new archive and -# `bazelisk run //tools:third-party -- --update`, which CI asks for. +# `bazelisk run //tools:third_party -- --update`, which CI asks for. http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # renovate: datasource=github-tags depName=ibireme/yyjson diff --git a/docs/contributing.md b/docs/contributing.md index ef47d541..9f2cffc2 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -65,10 +65,10 @@ The tools in `tools/` are C++17 and run through Bazel, with arguments after | --- | --- | | `//tools:amalgamate` | writes the single-file distribution; `-- --check` only compares it | | `//tools:check` | runs the repository checks | -| `//tools:third-party` | `-- --check` compares `third_party/` with the archives `MODULE.bazel` pins, `-- --update` writes it | +| `//tools:third_party` | `-- --check` compares `third_party/` with the archives `MODULE.bazel` pins, `-- --update` writes it | | `//tools:version` | prints the version; `-- --next` or `-- <version>` moves every place that states it, and the distribution | -| `//tools:release-notes` | prints a section of the release notes, of `-- <version>` or the current one | -| `//tools:repo-info` | reports the checkout and the tools on `PATH`; `-- --json` writes it as JSON | +| `//tools:release_notes` | prints a section of the release notes, of `-- <version>` or the current one | +| `//tools:repo_info` | reports the checkout and the tools on `PATH`; `-- --json` writes it as JSON | ## Two parts, two sets of rules diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index e7bb4801..fbe960aa 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -46,14 +46,14 @@ cc_binary( ) cc_binary( - name = "release-notes", + name = "release_notes", srcs = ["ReleaseNotesMain.cpp"], copts = CPP17, deps = [":library"], ) cc_binary( - name = "repo-info", + name = "repo_info", srcs = ["RepoInfoMain.cpp"], copts = CPP17, deps = [":library"], @@ -67,7 +67,7 @@ cc_binary( ) cc_binary( - name = "third-party", + name = "third_party", srcs = ["ThirdPartyMain.cpp"], args = [ "third_party/yyjson/yyjson.c=$(rlocationpath @yyjson_archive//:src/yyjson.c)", diff --git a/tools/ReleaseNotesMain.cpp b/tools/ReleaseNotesMain.cpp index 1eb67469..b32b57b0 100644 --- a/tools/ReleaseNotesMain.cpp +++ b/tools/ReleaseNotesMain.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2026 Progmasoft. // SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 -// bazelisk run //tools:release-notes -- [version] +// bazelisk run //tools:release_notes -- [version] // // Prints a section of docs/release-notes.md, of the current version without // an argument, for the text of a GitHub release. @@ -19,7 +19,7 @@ main(int argc, char **argv) if (argc > 2) { - std::cerr << "usage: bazelisk run //tools:release-notes -- [version]\n"; + std::cerr << "usage: bazelisk run //tools:release_notes -- [version]\n"; return 2; } const auto root = RepositoryRoot(); diff --git a/tools/RepoInfoMain.cpp b/tools/RepoInfoMain.cpp index 86ffb573..23b7e232 100644 --- a/tools/RepoInfoMain.cpp +++ b/tools/RepoInfoMain.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2026 Progmasoft. // SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 -// bazelisk run //tools:repo-info [-- --json] +// bazelisk run //tools:repo_info [-- --json] // // Reports the checkout and the tools on PATH, without changing anything. @@ -19,7 +19,7 @@ main(int argc, char **argv) const bool json = argc == 2 && std::string_view{ argv[1] } == "--json"; if (argc > 2 || (argc == 2 && !json)) { - std::cerr << "usage: bazelisk run //tools:repo-info [-- --json]\n"; + std::cerr << "usage: bazelisk run //tools:repo_info [-- --json]\n"; return 2; } const auto root = RepositoryRoot(); diff --git a/tools/ThirdPartyMain.cpp b/tools/ThirdPartyMain.cpp index 86c1d6c6..6223e85f 100644 --- a/tools/ThirdPartyMain.cpp +++ b/tools/ThirdPartyMain.cpp @@ -1,8 +1,8 @@ // Copyright (c) 2026 Progmasoft. // SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 -// bazelisk run //tools:third-party -- --check -// bazelisk run //tools:third-party -- --update +// bazelisk run //tools:third_party -- --check +// bazelisk run //tools:third_party -- --update // // Keeps third_party/ equal to the archives MODULE.bazel pins by version and // sha256. BUILD.bazel passes each file as <vendored path>=<runfile>. @@ -43,7 +43,7 @@ main(int argc, char **argv) } if (mode.empty()) { - std::cerr << "usage: bazelisk run //tools:third-party -- " + std::cerr << "usage: bazelisk run //tools:third_party -- " "--check|--update\n"; return 2; } @@ -76,7 +76,7 @@ main(int argc, char **argv) { problems.push_back(std::string{ vendored } + " differs from its pinned archive: run " - "bazelisk run //tools:third-party -- " + "bazelisk run //tools:third_party -- " "--update"); } }