Skip to content

🌱 ci(dco): treat upstream v6 history as landed on fork sync PRs - #196

Merged
hanthor merged 1 commit into
tuna/v6from
ci/fork-sync-signoff-and-gh-pin
Nov 18, 2026
Merged

hanthor merged 1 commit into
tuna/v6from
ci/fork-sync-signoff-and-gh-pin

Conversation

@hanthor

@hanthor hanthor commented Nov 18, 2026

Copy link
Copy Markdown
Member

Owner decision for #195: the "Sign-off survives the squash" gate exempts commits that are already in upstream hivecommons/hive v6 history.

  • Scope: PRs labelled merge-method/merge whose base is a tuna/* fork line, and never in hivecommons/hive itself.
  • For those PRs the job fetches upstream v6 into refs/remotes/upstream/v6 and adds that ref to LANDED_REFS. The checker already skips commits reachable from LANDED_REFS, so the script itself is unchanged.
  • Commits authored in the fork are not reachable from upstream v6, so they still need a matching sign-off.

πŸ€– Generated with Claude Code

A merge-method/merge PR into a tuna/* fork line carries upstream
hivecommons/hive v6 commits unchanged, signed off by their own authors.
Fetch upstream v6 and add it to LANDED_REFS for those PRs only, so the
squash-attribution gate skips commits upstream already gated. Commits
authored in the fork are not reachable from upstream v6 and are still
checked.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
@tuna-reef-hive

Copy link
Copy Markdown
5b78b9e

ℹ️ Sentinel notice β€” informational; author is trusted (owner), merge is not blocked

Hive flagged this PR (author @hanthor, head 5b78b9e87e5d) because it matches behaviors that can override security controls, escalate privileges or damage the codebase. This is a heuristic, not an accusation β€” a maintainer should confirm the change is intended before it merges.

  • sensitive_path β€” changes 1 sensitive path(s) (Touches a sensitive path (OWNERS, workflows, policies, hive config, security docs, …))
    • .github/workflows/dco-squash-attribution.yml

Hive did not add the sentinel-alert label because this author is trusted. The finding remains recorded for audit and the dashboard Security tab; set sentinel.trusted_authors_block: true to require the blocking label for trusted authors too.

@github-actions

Copy link
Copy Markdown

Open PR overlap check

Base branch: tuna/v6

Conflicts are checked with every PR merged onto the current tip of tuna/v6, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR Title Relation Files
#195 πŸ”€ sync: merge upstream hivecommons/hive v6 (f9389db) into tuna/v6 same files .github/workflows/dco-squash-attribution.yml

@tuna-reef-hive tuna-reef-hive Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Decision needed: @hanthor should confirm that commits reachable from upstream hivecommons/hive v6 may skip the sign-off gate on labelled merge-method/merge PRs into tuna/* branches.

Routing, not blocking: this edits a CI workflow (.github/workflows/dco-squash-attribution.yml) and loosens a sign-off gate, so a person should confirm it.

What I read. The new step (:63-80) only runs when the repo is not hivecommons/hive, the base starts with tuna/, and the PR carries merge-method/merge. It fetches upstream v6 and passes it through LANDED_REFS. The checker splits that variable by word (src/scripts/check-squash-signoff-attribution.sh:149) and skips commits reachable from each ref. The change works as described. When the step is skipped its output is empty, so the existing value is unchanged.

The decision. Anything reachable from upstream v6 is now exempt, and the label that enables this can be applied by anyone with triage rights. The body cites an owner decision on #195, so this looks intended. I still can't treat a gate relaxation in a workflow as approved. Commits written in the fork are still checked, as the body says.

Suggestion, not a defect. Neither the step nor the two-ref LANDED_REFS case has a test. test-check-squash-signoff-attribution.sh could cover the second ref.

I have not approved or merged anything.

β€” hive: agent=reviewer backend=claude model=claude-sonnet-5-5 effort=high claude=2.1.322

@tuna-reef-hive

Copy link
Copy Markdown

Needs a decision, not a merge:

  • the reviewer swarm returned requires_human @5b78b9e
  • the review found: the reviewer marked this change high-risk
  • reviewer question: @hanthor should confirm that commits reachable from upstream hivecommons/hive v6 may skip the sign-off gate on labelled merge-method/merge PRs into tuna/* branches.
  • the PR edits CI workflow / action files: awaiting owner approval β€” a hive owner / trusted merger's GitHub Approve review on the current head (or a /hive decision approve reply, typed on the PR or from the dashboard) releases the fence and the hive merges it; approval on an earlier head does not count unless the hive's own merge of the base branch is all that moved the head, so re-approve after a push

Head: verdict requires_human @5b78b9e, 17/19 checks green, 2 pending, soak 0s of 30m0s.

What to do: a trusted merger approves this head (5b78b9e) with a GitHub Approve review (or a /hive decision approve reply, typed here or from the dashboard), which releases the CI workflow-file fence and settles the reviewer's requires_human verdict, and the hive merges the PR once the other gates clear; approval on an earlier head carries over only the hive's own merge of the base branch (diff unchanged), and a /hive approve reply does not release the fence.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

@hanthor
hanthor merged commit 1f6aff8 into tuna/v6 Nov 18, 2026
26 checks passed
hanthor added a commit that referenced this pull request Nov 18, 2026
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
@github-actions

Copy link
Copy Markdown

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant