Skip to content

ci: migrate merge + security callers to github-workflows v3, unify auto-merge#11

Merged
bitwise-fast-forward-merge[bot] merged 1 commit into
bitwise-media-group:mainfrom
dmccaffery:ci/merge-callers-v3
Jun 24, 2026
Merged

ci: migrate merge + security callers to github-workflows v3, unify auto-merge#11
bitwise-fast-forward-merge[bot] merged 1 commit into
bitwise-media-group:mainfrom
dmccaffery:ci/merge-callers-v3

Conversation

@dmccaffery

@dmccaffery dmccaffery commented Jun 24, 2026

Copy link
Copy Markdown
Collaborator

Pins the merge, merge-review-ack and Dependabot auto-merge callers to github-workflows v3.0.0. The auto-merge machinery now triggers only on issue_comment, workflow_run and schedule — events that attach no check run to the PR — so the merge/* and auto-merge/* skipped checks are gone. Approvals are carried by the new merge-review-ack.yaml companion (its single ack job is the only check the system adds), which also fixes the fork-PR auto-merge gap (bitwise-media-group/github-workflows#10).

Folds the separate auto-merge.yaml caller into merge.yaml (v3 unifies the two reusable workflows into one) and deletes it. merge.yaml now drives the full flow — /merge, /auto-merge, the auto-merge label, and the scheduled sweep.

Also moves codeql.yaml to the v3 security.yaml reusable (build-free, so no Makefile needed). The ci and release callers stay on v1 until setup-evolve adopts the canonical Makefile — tracked in #10.

Signed-off-by: Deavon M. McCaffery dmccaffery@users.noreply.github.com

@github-actions

Copy link
Copy Markdown
Contributor

Note

Merging this PR: this repository merges by fast-forward so every
commit keeps its original signature. The GitHub merge button is not used.
Once this PR is approved and all checks pass, a maintainer merges it by
commenting /merge on the PR.

The branch must be up to date with main (rebased and re-signed) to
fast-forward. If /merge reports it is not fast-forwardable, rebase onto
main and comment /merge again.

…to-merge

Pins the merge, merge-review-ack and Dependabot auto-merge callers to github-workflows v3.0.0. The auto-merge machinery now triggers only on issue_comment, workflow_run and schedule — events that attach no check run to the PR — so the merge/* and auto-merge/* skipped checks are gone. Approvals are carried by the new merge-review-ack.yaml companion (its single ack job is the only check the system adds), which also fixes the fork-PR auto-merge gap (bitwise-media-group/github-workflows#10).

Folds the separate auto-merge.yaml caller into merge.yaml (v3 unifies the two reusable workflows into one) and deletes it. merge.yaml now drives the full flow — /merge, /auto-merge, the auto-merge label, and the scheduled sweep.

Also moves codeql.yaml to the v3 security.yaml reusable (build-free, so no Makefile needed). The ci and release callers stay on v1 until setup-evolve adopts the canonical Makefile — tracked in bitwise-media-group#10.

Signed-off-by: Deavon M. McCaffery <dmccaffery@users.noreply.github.com>
@dmccaffery dmccaffery force-pushed the ci/merge-callers-v3 branch from 12a7b7d to 3ec45f6 Compare June 24, 2026 19:26
@codecov

codecov Bot commented Jun 24, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@dmccaffery dmccaffery marked this pull request as ready for review June 24, 2026 19:29
@dmccaffery

Copy link
Copy Markdown
Collaborator Author

/merge

@bitwise-fast-forward-merge

Copy link
Copy Markdown

Fast-forwarded main to 3ec45f6bcb46 — original signature preserved, no re-sign.

@bitwise-fast-forward-merge bitwise-fast-forward-merge Bot merged commit 3ec45f6 into bitwise-media-group:main Jun 24, 2026
24 checks passed
@dmccaffery dmccaffery deleted the ci/merge-callers-v3 branch June 24, 2026 19:44
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.

2 participants