diff --git a/.github/workflows/regenerate.yml b/.github/workflows/regenerate.yml index fc8455f..d59cf3c 100644 --- a/.github/workflows/regenerate.yml +++ b/.github/workflows/regenerate.yml @@ -2,7 +2,7 @@ name: Regenerate # Once a day, checks the template's master: whatever reaches master is a release, tagged by its release.yml. # When master carries a release these samples are not generated from yet, every release branch is replaced -# by a fresh generation from that tag. A branch with a "ref" in variants.json (nightly, on dev) follows that +# by a fresh generation from that tag. A branch with a "ref" in variants.json (full-dev, on dev) follows that # branch of the template instead and is replaced when it has moved. # # The branches carry workflow files, which GITHUB_TOKEN may not push, and a push by GITHUB_TOKEN starts no diff --git a/.samples/generate.sh b/.samples/generate.sh index fd3c5b0..2e86937 100644 --- a/.samples/generate.sh +++ b/.samples/generate.sh @@ -110,7 +110,7 @@ if [ "$(jq -r --arg b "$branch" '.[] | select(.branch == $b) | .default // false echo echo "Once a day [regenerate](.github/workflows/regenerate.yml) checks the template's master: what reaches" echo "master is a release, and every release branch is generated again from a new one, pushed, and its CI runs." - echo "nightly follows dev instead, where the next release is built: it is generated again when dev has moved." + echo "full-dev follows dev instead, where the next release is built: it is generated again when dev has moved." echo "After each CI run of a branch, [report](.github/workflows/report.yml) writes the run into the branch's" echo "reports// folder: tests, coverage, time and the branch's files, one file per release, and" echo "ci.svg, the picture of its days above." diff --git a/.samples/report.sh b/.samples/report.sh index 2cdb258..23bc72a 100644 --- a/.samples/report.sh +++ b/.samples/report.sh @@ -6,7 +6,7 @@ # # The reports live in reports//, so two branches merged together keep each other's reports. # reports//.json keeps every run of the branch generated from that version (a release tag, -# or the template's commit for nightly) and the branch's files; .md is the same for a reader. +# or the template's commit for full-dev) and the branch's files; .md is the same for a reader. # reports//ci.svg draws the branch's runs by day for its README (ci-svg.py). # reports//index.json lists the reports with their last run: the site reads it from # raw.githubusercontent.com, which cannot list a folder. Reports an earlier run left directly in reports/ diff --git a/.samples/variants.json b/.samples/variants.json index 40e67d4..bbb7170 100644 --- a/.samples/variants.json +++ b/.samples/variants.json @@ -33,7 +33,7 @@ ] }, { - "branch": "nightly", + "branch": "full-dev", "ref": "dev", "about": "The flags of full and the ones dev adds before a release, generated from the template's dev once a day when it has moved. A red CI here is a break in dev before a release.", "generate": [ diff --git a/README.md b/README.md index a0a6851..050c239 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Nothing here is edited by hand: the branch is replaced when the template moves o | [`gateway`](https://github.com/sawking-tech/DotNetSolutionKit.Samples/tree/gateway) | Two services behind a YARP gateway that validates the token and forwards the user. | [![CI](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml/badge.svg?branch=gateway)](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml?query=branch%3Agateway) | | [`full`](https://github.com/sawking-tech/DotNetSolutionKit.Samples/tree/full) | Every flag: the bus with an outbox, Infisical, feature flags, the API diff, access rules over a tenant tree, object storage, ClickHouse; two services. | [![CI](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml/badge.svg?branch=full)](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml?query=branch%3Afull) | | [`full-alt`](https://github.com/sawking-tech/DotNetSolutionKit.Samples/tree/full-alt) | SQL Server, xUnit, secrets from Vault, Kubernetes manifests and the audit journal, which rides on the bus with an outbox; two services. | [![CI](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml/badge.svg?branch=full-alt)](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml?query=branch%3Afull-alt) | -| [`nightly`](https://github.com/sawking-tech/DotNetSolutionKit.Samples/tree/nightly) | The flags of full and the ones dev adds before a release, generated from the template's dev once a day when it has moved. A red CI here is a break in dev before a release. | [![CI](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml/badge.svg?branch=nightly)](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml?query=branch%3Anightly) | +| [`full-dev`](https://github.com/sawking-tech/DotNetSolutionKit.Samples/tree/full-dev) | The flags of full and the ones dev adds before a release, generated from the template's dev once a day when it has moved. A red CI here is a break in dev before a release. | [![CI](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml/badge.svg?branch=full-dev)](https://github.com/sawking-tech/DotNetSolutionKit.Samples/actions/workflows/ci.yml?query=branch%3Afull-dev) | The CI of each branch by day, as [the samples page](https://dnsk.sawking.tech/samples.html) shows it: @@ -35,7 +35,7 @@ The CI of each branch by day, as [the samples page](https://dnsk.sawking.tech/sa [![CI of full-alt by day](https://raw.githubusercontent.com/sawking-tech/DotNetSolutionKit.Samples/full-alt/reports/full-alt/ci.svg)](https://dnsk.sawking.tech/samples.html#full-alt) -[![CI of nightly by day](https://raw.githubusercontent.com/sawking-tech/DotNetSolutionKit.Samples/nightly/reports/nightly/ci.svg)](https://dnsk.sawking.tech/samples.html#nightly) +[![CI of full-dev by day](https://raw.githubusercontent.com/sawking-tech/DotNetSolutionKit.Samples/full-dev/reports/full-dev/ci.svg)](https://dnsk.sawking.tech/samples.html#full-dev) Each square is a day in UTC, Monday at the top and Sunday at the bottom. A day shows the result of the @@ -47,7 +47,7 @@ come. Once a day [regenerate](.github/workflows/regenerate.yml) checks the template's master: what reaches master is a release, and every release branch is generated again from a new one, pushed, and its CI runs. -nightly follows dev instead, where the next release is built: it is generated again when dev has moved. +full-dev follows dev instead, where the next release is built: it is generated again when dev has moved. After each CI run of a branch, [report](.github/workflows/report.yml) writes the run into the branch's reports// folder: tests, coverage, time and the branch's files, one file per release, and ci.svg, the picture of its days above.