🔀 Merge chore/improve-ci-publish into main
This commit is contained in:
commit
b8d235df89
3 files changed
+54
-27
No files matched your search
+32
-15
@@ -65,8 +65,8 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
# Fail fast when the job container is not the baked image: a stale
|
# Fail fast when the job container is not the baked image: a stale
|
||||||
# tag on the runner (`forcePull=false` in its pull log) silently
|
# tag on the runner (`forcePull=false` in its pull log) silently
|
||||||
# reintroduces the per-job download. Mirrors the publish job's
|
# reintroduces the per-job download. Cheap, and it names the
|
||||||
# NPM_TOKEN assert — cheap, and it names the invariant.
|
# invariant.
|
||||||
- name: Assert the baked tool cache is present
|
- name: Assert the baked tool cache is present
|
||||||
run: |
|
run: |
|
||||||
test -f "/opt/hostedtoolcache/node/$(tr -d '[:space:]' < .node-version)/x64.complete"
|
test -f "/opt/hostedtoolcache/node/$(tr -d '[:space:]' < .node-version)/x64.complete"
|
||||||
@@ -142,19 +142,17 @@ jobs:
|
|||||||
container:
|
container:
|
||||||
image: gitea.e1nsnull.de/tmu/act-ci:26.8.2
|
image: gitea.e1nsnull.de/tmu/act-ci:26.8.2
|
||||||
# The release page is created with the run's automatic Gitea token
|
# The release page is created with the run's automatic Gitea token
|
||||||
# (`github.token`), not `NPM_TOKEN`, so it needs `contents: write`.
|
# (`github.token`), so it needs `contents: write`.
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
# The npm token is optional: `secrets` is not an allowed context in a
|
||||||
|
# step `if` (see GitHub's context-availability table), so it is lifted
|
||||||
|
# into job-level `env`, where an unset secret arrives as the empty
|
||||||
|
# string and skips the publish rather than attempting an unauthenticated
|
||||||
|
# one. Set NPM_TOKEN in the Gitea repo: Settings → Actions → Secrets.
|
||||||
|
env:
|
||||||
|
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||||
steps:
|
steps:
|
||||||
# Double-gate: publish only runs on a tag *and* aborts here if NPM_TOKEN
|
|
||||||
# is unset, so a tag push never silently no-ops (or half-publishes). Set
|
|
||||||
# NPM_TOKEN in the Gitea repo: Settings → Actions → Secrets.
|
|
||||||
- name: Assert NPM_TOKEN is configured
|
|
||||||
run: |
|
|
||||||
if [ -z "${{ secrets.NPM_TOKEN }}" ]; then
|
|
||||||
echo "::error::NPM_TOKEN secret is not set — refusing to publish."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
@@ -183,9 +181,28 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
TAG_REF: ${{ gitea.ref }}
|
TAG_REF: ${{ gitea.ref }}
|
||||||
run: ./scripts/release-notes.sh "${TAG_REF#refs/tags/}" > release-notes.md
|
run: ./scripts/release-notes.sh "${TAG_REF#refs/tags/}" > release-notes.md
|
||||||
- uses: https://gitea.com/actions/gitea-release-action@v1
|
- name: Create the Gitea release
|
||||||
|
id: gitea_release
|
||||||
|
uses: https://gitea.com/actions/gitea-release-action@v1
|
||||||
with:
|
with:
|
||||||
body_path: release-notes.md
|
body_path: release-notes.md
|
||||||
- run: npm publish --access public
|
- name: Publish to npm
|
||||||
|
id: npm_publish
|
||||||
|
if: env.NPM_TOKEN != ''
|
||||||
|
run: npm publish --access public
|
||||||
env:
|
env:
|
||||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
NODE_AUTH_TOKEN: ${{ env.NPM_TOKEN }}
|
||||||
|
# All-or-nothing: the tag is only released once *both* the release
|
||||||
|
# page and the npm package are up. A skipped npm publish (NPM_TOKEN
|
||||||
|
# unset) has no `success` outcome, so `always()` reaches this check
|
||||||
|
# even after a failure and turns the skipped half into an explicit
|
||||||
|
# red job instead of a silently green one.
|
||||||
|
- name: Require both releases
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
GITEA="${{ steps.gitea_release.outcome }}"
|
||||||
|
NPM="${{ steps.npm_publish.outcome }}"
|
||||||
|
if [ "${GITEA}" != success ] || [ "${NPM}" != success ]; then
|
||||||
|
echo "::error::incomplete release — gitea=${GITEA:-skipped} npm=${NPM:-skipped}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
+14
-12
@@ -45,18 +45,18 @@ Separately, some top-level scripts are **bare** (no prefix): the entry points th
|
|||||||
|
|
||||||
The tools are organized into a feedback ladder. Each tier catches different things at different costs; the rule of thumb is "earlier tiers fire more often, faster tiers catch less, slower tiers are more thorough":
|
The tools are organized into a feedback ladder. Each tier catches different things at different costs; the rule of thumb is "earlier tiers fire more often, faster tiers catch less, slower tiers are more thorough":
|
||||||
|
|
||||||
| Tier | When | What it runs | Time |
|
| Tier | When | What it runs | Time |
|
||||||
| -------------------------------- | ----------------------- | -------------------------------------------------------------------------------------------------------- | ----- |
|
| -------------------------------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- | ----- |
|
||||||
| `npm run watch` | manual | `watch:test` — re-runs tests on file save | ~0.1s |
|
| `npm run watch` | manual | `watch:test` — re-runs tests on file save | ~0.1s |
|
||||||
| Pre-commit (auto) | on stage | tsc + oxlint + oxfmt + cspell (staged files only) | ~1.3s |
|
| Pre-commit (auto) | on stage | tsc + oxlint + oxfmt + cspell (staged files only) | ~1.3s |
|
||||||
| Pre-push (auto) | on push | `npm test` (full tsc + unit tests) | ~3.5s |
|
| Pre-push (auto) | on push | `npm test` (full tsc + unit tests) | ~3.5s |
|
||||||
| `npm run check` | manual | Correctness gates: tsc + oxlint + oxfmt + cspell (whole project) | ~3s |
|
| `npm run check` | manual | Correctness gates: tsc + oxlint + oxfmt + cspell (whole project) | ~3s |
|
||||||
| `npm run verify` | manual | Definition of done: `npm run check` + unit tests, one shot | ~6s |
|
| `npm run verify` | manual | Definition of done: `npm run check` + unit tests, one shot | ~6s |
|
||||||
| `npm run fix` | manual | Auto-resolve fixable issues (lint, format) | ~3s |
|
| `npm run fix` | manual | Auto-resolve fixable issues (lint, format) | ~3s |
|
||||||
| `npm run maintain` | manual / CI (advisory) | `maintain:knip` + `maintain:outdated` (whole-project + network scans) | ~10s |
|
| `npm run maintain` | manual / CI (advisory) | `maintain:knip` + `maintain:outdated` (whole-project + network scans) | ~10s |
|
||||||
| CI build (auto) | on push to `main` / tag | `build` job (build + correctness + packaging) — see [.gitea/workflows/ci.yml](./.gitea/workflows/ci.yml) | ~30s+ |
|
| CI build (auto) | on push to `main` / tag | `build` job (build + correctness + packaging) — see [.gitea/workflows/ci.yml](./.gitea/workflows/ci.yml) | ~30s+ |
|
||||||
| CI maintain (auto, non-blocking) | on push to `main` | `npm run maintain` — reports, never fails the build | ~10s |
|
| CI maintain (auto, non-blocking) | on push to `main` | `npm run maintain` — reports, never fails the build | ~10s |
|
||||||
| CI publish (auto) | on tag | Gitea release page (body from CHANGELOG) + `publish:publint` + `publish:attw`, then `npm publish` | ~15s |
|
| CI publish (auto) | on tag | packaging checks + `publish:publint` / `publish:attw`, then the Gitea release page and `npm publish` (skipped, and the job failed, without `NPM_TOKEN`) | ~15s |
|
||||||
|
|
||||||
### Why these splits?
|
### Why these splits?
|
||||||
|
|
||||||
@@ -115,3 +115,5 @@ Publishing is CI-only by policy. Local `npm publish` is not supported. The maint
|
|||||||
2. The maintainer runs `npm run create:release`. VS Code opens `CHANGELOG.md` to finalize the `[Unreleased]` notes; because pubv refuses a dirty tree, any edit is committed first (then folded into the release commit), and pubv's interactive prompt suggests a version from those notes — the maintainer confirms or edits it.
|
2. The maintainer runs `npm run create:release`. VS Code opens `CHANGELOG.md` to finalize the `[Unreleased]` notes; because pubv refuses a dirty tree, any edit is committed first (then folded into the release commit), and pubv's interactive prompt suggests a version from those notes — the maintainer confirms or edits it.
|
||||||
3. `scripts/release.sh` creates a single release commit (graduated changelog + package.json bump, amended into one commit), tags it, and pushes everything to Gitea.
|
3. `scripts/release.sh` creates a single release commit (graduated changelog + package.json bump, amended into one commit), tags it, and pushes everything to Gitea.
|
||||||
4. CI fires on both pushes: the `publish` job runs on the tag (`build` + publish-tier checks + release page + `npm publish`), while the branch run's `release-gate` job recognizes the release commit and skips `build`/`maintain` — the tag verifies the identical SHA, so no work is duplicated. The job graph lives in [.gitea/workflows/ci.yml](./.gitea/workflows/ci.yml) — keep that file, not this list, as the source of truth. The publish-tier checks must pass before the artifact is published. The `publish` job also creates the Gitea release page from the matching Keep-a-Changelog section (`scripts/release-notes.sh`); it runs _before_ `npm publish` so a broken page fails CI without consuming a version, and `npm publish` stays the last step.
|
4. CI fires on both pushes: the `publish` job runs on the tag (`build` + publish-tier checks + release page + `npm publish`), while the branch run's `release-gate` job recognizes the release commit and skips `build`/`maintain` — the tag verifies the identical SHA, so no work is duplicated. The job graph lives in [.gitea/workflows/ci.yml](./.gitea/workflows/ci.yml) — keep that file, not this list, as the source of truth. The publish-tier checks must pass before the artifact is published. The `publish` job also creates the Gitea release page from the matching Keep-a-Changelog section (`scripts/release-notes.sh`); it runs _before_ `npm publish` so a broken page fails CI without consuming a version, and `npm publish` stays the last step.
|
||||||
|
|
||||||
|
The Gitea release page uses the run's automatic token (`github.token`), so it only needs `contents: write`. `npm publish` is gated on `NPM_TOKEN`, lifted into job-level `env` because `secrets` is not an allowed context in a step `if`: an unset secret skips the publish instead of attempting an unauthenticated one. A tag is all-or-nothing, though — a final `always()` step fails the job unless both the release page and `npm publish` reported `success`, so a skipped or failed npm half turns the job red rather than silently green. Set `NPM_TOKEN` (npm publish rights) under Settings → Actions → Secrets.
|
||||||
@@ -24,6 +24,7 @@ Bugs:
|
|||||||
Enhancements:
|
Enhancements:
|
||||||
|
|
||||||
Documentation:
|
Documentation:
|
||||||
|
☐ Clean up CONTRIBUTING.md and README.md, create docs
|
||||||
☐ Add usage examples to README.md
|
☐ Add usage examples to README.md
|
||||||
☐ Create `examples/` directory with runnable snippets
|
☐ Create `examples/` directory with runnable snippets
|
||||||
☐ Add comparison section vs. other TS pattern-matching libs
|
☐ Add comparison section vs. other TS pattern-matching libs
|
||||||
@@ -54,3 +55,10 @@ Maintenance:
|
|||||||
✔ Guard the invariant in CI (`Assert the baked tool cache is present`) @done
|
✔ Guard the invariant in CI (`Assert the baked tool cache is present`) @done
|
||||||
☐ Enable force-pull for the runner so a changed act-ci image is never missed @low
|
☐ Enable force-pull for the runner so a changed act-ci image is never missed @low
|
||||||
→ the tag encodes only the Node version, so a Dockerfile change yields new content under an unchanged tag; with `forcePull=false` the runner keeps the old image (see CONTRIBUTING § CI runner image)
|
→ the tag encodes only the Node version, so a Dockerfile change yields new content under an unchanged tag; with `forcePull=false` the runner keeps the old image (see CONTRIBUTING § CI runner image)
|
||||||
|
✔ Improve CI publish @done
|
||||||
|
✔ Check whether publish job is only run on tags, if not, guard it @done
|
||||||
|
✔ Gate only single steps @done
|
||||||
|
✔ Do not publish to npm, if NPM_TOKEN is not set (e.g. PRs from forks) @done
|
||||||
|
✔ Do not publish to Gitea — uses the run's automatic `github.token`, so no secret gate is needed @done
|
||||||
|
✔ Otherwise run the steps @done
|
||||||
|
✔ Fail the job unless both the Gitea release and npm publish succeeded @done
|
||||||
Reference in new issue
Block a user