feat(forgejo): auto-merge.sh end-to-end loop helper + ADR-016 update #13

Merged

navigator merged 1 commit from feature/auto-merge-helper into main

2026-05-24 11:28:40 -03:00

navigator commented

2026-05-24 11:27:42 -03:00

Owner

End-to-end GitOps loop helper that wraps the manual orchestration validated on PRs #10/#11/#12.

bash infra/forgejo/auto-merge.sh <PR_NUM> [timeout]:

Fetches PR head SHA via admin API
Polls workflow runs for that SHA every 20s
Exits 2 if any job fails; 3 on timeout (default 15min)
When all jobs green: calls approve-pr.sh (fluidpop-bot review)
Re-checks mergeable; squash-merges via admin token
Exit 0 on success; 4/5 on approval/merge failures

Self-test: this PR itself will be merged via the helper (if CI green) as proof.

Tests: docs-only (script + ADR text). CI runs shell-lint on the new script. Per GitOps workflow, ready for fluidpop-bot self-test approve + merge via auto-merge.sh.

ADR-016 Tracking section updated to reference the helper and clarify acceptance criterion.

End-to-end GitOps loop helper that wraps the manual orchestration validated on PRs #10/#11/#12. `bash infra/forgejo/auto-merge.sh <PR_NUM> [timeout]`: 1. Fetches PR head SHA via admin API 2. Polls workflow runs for that SHA every 20s 3. Exits 2 if any job fails; 3 on timeout (default 15min) 4. When all jobs green: calls approve-pr.sh (fluidpop-bot review) 5. Re-checks mergeable; squash-merges via admin token 6. Exit 0 on success; 4/5 on approval/merge failures Self-test: this PR itself will be merged via the helper (if CI green) as proof. Tests: docs-only (script + ADR text). CI runs shell-lint on the new script. Per GitOps workflow, ready for fluidpop-bot self-test approve + merge via auto-merge.sh. ADR-016 Tracking section updated to reference the helper and clarify acceptance criterion.

navigator added the

area:infra

adr

phase:1

labels

2026-05-24 11:27:42 -03:00

navigator added 1 commit

2026-05-24 11:27:42 -03:00

feat(forgejo): auto-merge.sh end-to-end loop helper + ADR-016 update

build / scalafmt-check (push) Successful in 4s

Details

build / sbt-compile (push) Successful in 3s

Details

build / shell-lint (push) Successful in 48s

Details

build / scalafmt-check (pull_request) Successful in 3s

Details

build / sbt-compile (pull_request) Successful in 3s

Details

build / shell-lint (pull_request) Successful in 8s

Details

63ba4bcbc9

infra/forgejo/auto-merge.sh PR_NUM [timeout]: wraps the full GitOps loop in
one call.

1. Fetch PR head SHA
2. Poll workflow runs for that SHA every 20s
3. Exit code 2 if any job fails; 3 on timeout (default 15min)
4. When all green: call approve-pr.sh (fluidpop-bot review)
5. Re-check mergeable; squash-merge via admin token
6. Exit code 0 on success; 4/5 on approval/merge failures

Future PRs: bash infra/forgejo/auto-merge.sh <N> is the one-liner that
takes a PR from green-CI to merged-on-main without manual intervention.

ADR-016 Tracking section updated to reference the new helper and clarify
that PRs #10/#11/#12 were merged via the manual variant of the loop;
auto-merge.sh validation is the criterion for Status -> Accepted.