From 9cdb1af68731bf06c960db4f017f09761c05b77d Mon Sep 17 00:00:00 2001 From: prql-bot Date: Thu, 25 Jun 2026 08:52:58 +0000 Subject: [PATCH 1/2] internal: warn against hand-editing generated tend workflows during regen A manual stopgap edit to tend-review.yaml (#6038) collided with the same change in the open 0.1.7 regen PR (#6033, generic title "update tend workflows"), leaving a duplicate `with:` key that broke lint-megalinter on main and required ci-fix #6039. Add a running-tend rule to diff against the open regen PR (by file path, not title) or route changes through .config/tend.yaml. Co-Authored-By: Claude Opus 4.8 --- .claude/skills/running-tend/SKILL.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.claude/skills/running-tend/SKILL.md b/.claude/skills/running-tend/SKILL.md index 6d141ca640b9..e24c540101f3 100644 --- a/.claude/skills/running-tend/SKILL.md +++ b/.claude/skills/running-tend/SKILL.md @@ -28,6 +28,19 @@ permission first) still applies when the target shows no agent signals. follows structural changes a version-only bump can't — e.g. the 0.1.7 move that split the action into `claude/`/`codex/` subdirectories broke the naive Dependabot bump #6031. Don't re-add `max-sixty/tend` to Dependabot. +- **Don't hand-edit a generated `tend-*.yaml` workflow file when a regen PR is + open.** The nightly `tend/update-workflows` regen bundles individual fixes + under the generic title `chore: update tend workflows`, so a title-keyword + dedup before `gh pr create` won't surface it — the change you're about to make + by hand may already be in that open PR. Before opening a manual stopgap edit + to a generated workflow, diff the file against the open regen PR (compare by + the *file path* it touches, not the title) or route the change through + `.config/tend.yaml` so the regen carries it. Landing both independently + double-applies the change: on 2026-06-24 a manual `allow-unsafe-pr-checkout` + stopgap (#6038) collided with the same line in the open 0.1.7 regen (#6033, + titled "update tend workflows"); both merged, leaving a duplicate `with:` key + that broke `lint-megalinter`/`actionlint` on `main` and required a ci-fix PR + (#6039). - Automerge: not configured — `pull-request-target.yaml` only validates PR titles and handles `pr-backport-web` backports. The automerge job was removed in #5753, so bot PRs must be merged manually by a maintainer (or via repo From c889208970c3e88fdbebdae25da51f17976e5f62 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2026 08:53:39 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .claude/skills/running-tend/SKILL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.claude/skills/running-tend/SKILL.md b/.claude/skills/running-tend/SKILL.md index e24c540101f3..3e62162e2c16 100644 --- a/.claude/skills/running-tend/SKILL.md +++ b/.claude/skills/running-tend/SKILL.md @@ -34,7 +34,7 @@ permission first) still applies when the target shows no agent signals. dedup before `gh pr create` won't surface it — the change you're about to make by hand may already be in that open PR. Before opening a manual stopgap edit to a generated workflow, diff the file against the open regen PR (compare by - the *file path* it touches, not the title) or route the change through + the _file path_ it touches, not the title) or route the change through `.config/tend.yaml` so the regen carries it. Landing both independently double-applies the change: on 2026-06-24 a manual `allow-unsafe-pr-checkout` stopgap (#6038) collided with the same line in the open 0.1.7 regen (#6033,