fix(ci): validate the release tag and query pending PRs by label
PR Check / Security scan (Snyk) (pull_request) Skipped
PR Check / Lint + typecheck (pull_request) Successful in 1m8s
PR Check / Secret scan (gitleaks) (pull_request) Successful in 6s
PR Check / Dependency audit (pull_request) Successful in 8s
PR Check / Dockerfile lint (droast) (pull_request) Successful in 5s
PR Check / Security scan (Snyk) (pull_request) Skipped
PR Check / Lint + typecheck (pull_request) Successful in 1m8s
PR Check / Secret scan (gitleaks) (pull_request) Successful in 6s
PR Check / Dependency audit (pull_request) Successful in 8s
PR Check / Dockerfile lint (droast) (pull_request) Successful in 5s
Both PR-Agent findings were confirmed. A tag at the merge commit now counts only when it is exactly v<manifest version>; foreign CI or annotation tags are logged and ignored. Pending release PRs are fetched through the autorelease: pending label filter instead of paging every closed PR, so a concurrent close cannot shift a page and hide one.
Also fail loudly on a merged PR without merge_commit_sha or a manifest without a version, instead of producing vundefined.
Rebased on main after the separate audit fix (e0c69c1); the dependency overrides and lockfile changes from the earlier local commit were dropped. Verified on the rebased tree: lint, typecheck, build, the exact audit command, actionlint and a live dry run.
This commit is contained in:
1 parent
1860e88156
commit
7ffc6d73b6
5 files changed
+297
No files matched your search
@@ -16,6 +16,9 @@ sources:
|
||||
- id: workflow
|
||||
resource: .gitea/workflows/release-please.yml
|
||||
title: release-please workflow
|
||||
- id: reconcile
|
||||
resource: scripts/reconcile-release-please.mjs
|
||||
title: release-please state reconciliation
|
||||
---
|
||||
|
||||
# Decision
|
||||
@@ -97,6 +100,58 @@ confirmed by comparison, not inference: while `fix/release_please` still
|
||||
existed, PR #23 reported `head.ref = fix/release_please`; every PR whose
|
||||
branch was gone reported `refs/pull/<n>/head`.
|
||||
|
||||
# A pending label outlives the branch and blocks every later release (2026-10-31)
|
||||
|
||||
Flipping `default_delete_branch_after_merge` to `false` only protects
|
||||
branches deleted *after* the change. PR #22's branch was already gone, so
|
||||
its `head.ref` stayed `refs/pull/22/head` and its `autorelease: pending`
|
||||
label stayed attached. Run 143 (task 475, 2026-10-27, the run immediately
|
||||
after #22 merged) shows the full deadlock:
|
||||
|
||||
```
|
||||
❯ Found pull request #22: 'chore: release main'
|
||||
✖ Bad branch name: refs/pull/22/head
|
||||
...
|
||||
✔ Building candidate release pull request for path: .
|
||||
❯ Found pull request #22: 'chore: release main'
|
||||
⚠ There are untagged, merged release PRs outstanding - aborting
|
||||
::set-output:: prs_created=false
|
||||
::set-output:: releases_created=false
|
||||
```
|
||||
|
||||
The first block fails the tagging phase. The second finds the same
|
||||
still-pending PR and aborts the propose phase, so no new release PR is
|
||||
even opened. Every later run (145, 148, 151, 153, 162, 164, 167) has the
|
||||
same shape. The hand-created `v1.4.0` tag restores the baseline (`found:
|
||||
v1.4.0`) but does not clear the label, so it does not break the
|
||||
deadlock. This is the current reason the pipeline is still healthy-looking
|
||||
and tagless.
|
||||
|
||||
The workflow now reconciles that state before the action runs
|
||||
(`scripts/reconcile-release-please.mjs`):
|
||||
|
||||
* merged + `autorelease: pending` + a tag already at the merge commit ->
|
||||
replace the label with `autorelease: tagged`;
|
||||
* merged + `autorelease: pending` + head branch gone + no tag -> create
|
||||
the tag from the version recorded in the manifest at the merge commit
|
||||
(the exact tag release-please would have made), then swap the label;
|
||||
* merged + `autorelease: pending` + head branch still present -> leave
|
||||
it; release-please tags it in the same run.
|
||||
|
||||
The step is idempotent and runs on every push to `main` and every manual
|
||||
dispatch, so a deleted branch cannot silently poison the release pipeline
|
||||
again. #20 and #21 are not labelled pending, so they do not block; their
|
||||
tags remain the one-time manual recovery in the table below.
|
||||
|
||||
Two details keep the reconciliation from suppressing a real release:
|
||||
|
||||
* pending PRs are fetched through the `autorelease: pending` label filter,
|
||||
not by paging every closed PR, so concurrent PR closes cannot shift a
|
||||
page and hide one;
|
||||
* a tag at the merge commit counts only when its name is exactly
|
||||
`v<manifest version>`. A CI or annotation tag on the same commit is
|
||||
logged and ignored, and the release tag is still created.
|
||||
|
||||
# Recovering the versions that never got a tag
|
||||
|
||||
The label alone cannot recover them — #20, #21 and #22 all lost their head
|
||||
@@ -123,6 +178,11 @@ whole history.
|
||||
|
||||
* That the release phase tags correctly once the head branch survives a
|
||||
merge. The next release cycle proves it.
|
||||
* That the reconcile step's tag-creation fallback works with a live
|
||||
token. Only the tag-already-exists path was exercised, in dry-run,
|
||||
against the live PR #22. The fallback is written from the same Gitea
|
||||
API shapes (`POST /tags`, `PUT /issues/{index}/labels`) the rest of the
|
||||
workflow uses.
|
||||
* That `RELEASE_PLEASE_TOKEN_CV_SITE_NUXT` carries the `write:issue`
|
||||
scope the same way `PR_GITEA_TOKEN` needed it; the previous failure
|
||||
was an immediate API rejection consistent with a scope problem.
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
# Update Log
|
||||
|
||||
## 2026-10-31 (PR #33 second review: release tag validated, pending PRs queried by label)
|
||||
|
||||
* **Fix**: [reconcile-release-please.mjs](../scripts/reconcile-release-please.mjs) - both PR-Agent findings were confirmed. A tag at the merge commit now counts only when it is exactly `v<manifest version>`; a foreign CI/annotation tag is logged and ignored. Pending release PRs are fetched through the `autorelease: pending` label filter instead of paging every closed PR, so a concurrent close cannot shift a page and hide one.
|
||||
* **Guard**: a merged PR without `merge_commit_sha`, or a manifest without a version, now fails loudly instead of producing `vundefined`.
|
||||
* **Verified locally**: dry-run against the live repo still matches #22 to `v1.4.0`; `pnpm lint`, `pnpm typecheck`, `pnpm build` and `pnpm audit --prod --audit-level moderate` pass on the rebased tree.
|
||||
* **Known issue**: PR-Agent's `/describe` posts `Failed to update PR description`; the bot token has `write:issue` but not the PR-edit scope. Recorded with the fix in [PR-Agent operations](pr-agent.md).
|
||||
|
||||
## 2026-10-31 (registry host corrected: Gitea's built-in registry on git.noelsabia.dev)
|
||||
|
||||
* **Correction**: `registry.noelsabia.dev` is gone from the documentation and the workflow. Gitea's built-in container registry is served on the Gitea hostname itself, so the image is **`git.noelsabia.dev/cv_website/nuxt:<tag>`** ([docs.gitea.com/usage/packages/container](https://docs.gitea.com/usage/packages/container/)). `registry.noelsabia.dev` was a separate hostname set up before that was known; the server-side setup is being reverted. No separate registry, no extra hostname, no extra certificate - Gitea already provides this by default.
|
||||
|
||||
@@ -52,6 +52,16 @@ access is a separate change.
|
||||
it, Gitea's default egress policy refuses deliveries to the Docker
|
||||
network.
|
||||
|
||||
# Known issue: "Failed to update PR description"
|
||||
|
||||
On PR #33 (2026-10-31) `/describe` posted `Failed to update PR description`
|
||||
before the reviewer guide. Comments work because the bot token has
|
||||
`write:issue`; editing the PR body is a repository-route write and needs
|
||||
`write:repository` as well. Add that scope to the `pr-agent` token and
|
||||
restart the service, or remove `/describe` from `GITEA__PR_COMMANDS` if the
|
||||
description update is not wanted. The review comment is still posted; this
|
||||
affects only the description sync.
|
||||
|
||||
# Commands
|
||||
|
||||
| Trigger | What runs |
|
||||
|
||||
Reference in new issue
Block a user