thwap/steeper

Watch

Fork 0

fix(ci): diff origin/main...HEAD for rebase-based PRs #360

Merged

fuzzy merged 5 commits from fix/358-ci-go-changes into main

2026-07-08 09:04:48 +00:00

automation commented

2026-07-08 08:49:59 +00:00

Owner

What

Fix the CI go-changes step that was skipping Go tooling even when .go files were modified.

Root cause: git diff HEAD^1..HEAD^2 fails on rebase-based PRs where HEAD is the branch tip, not a merge commit.

Fix: git fetch origin main && git diff --name-only origin/main...HEAD which works correctly for all rebase branches.

Testing

YAML schema validation passes
Pre-commit hooks pass (yaml, forgejo-runner-validate)
Works on rebase-based PR checkouts

Closes #358

## What Fix the CI `go-changes` step that was skipping Go tooling even when `.go` files were modified. Root cause: `git diff HEAD^1..HEAD^2` fails on rebase-based PRs where HEAD is the branch tip, not a merge commit. Fix: `git fetch origin main && git diff --name-only origin/main...HEAD` which works correctly for all rebase branches. ## Testing - [x] YAML schema validation passes - [x] Pre-commit hooks pass (yaml, forgejo-runner-validate) - [x] Works on rebase-based PR checkouts Closes #358

automation added 1 commit

2026-07-08 08:49:59 +00:00

fix(ci): diff origin/main...HEAD for rebase-based PRs

Test and Release / lint (pull_request) Successful in 27s

Details

Test and Release / test (pull_request) Successful in 27s

Details

065bdd1d2d

Rebase workflow means HEAD is the branch tip, not a merge commit.
Use git diff origin/main...HEAD which works correctly for rebase
branches where the checkout is a simple branch checkout.

fuzzy self-assigned this

2026-07-08 08:50:07 +00:00

the.auditor approved these changes

2026-07-08 08:50:32 +00:00

Dismissed

the.auditor left a comment

Review

Result: Approved — no issues. Closes #358.

Summary: Reverts PR #359's HEAD^1..HEAD^2 approach (broken on rebase PRs — no merge commit). Restores git fetch origin main + git diff --name-only origin/main...HEAD which correctly uses the three-dot merge-base comparison for rebase-based branches. This is the correct fix — the original PR #335 had the right approach, PR #359's change was incorrect.

## Review **Result: Approved** — no issues. Closes #358. **Summary:** Reverts PR #359's `HEAD^1..HEAD^2` approach (broken on rebase PRs — no merge commit). Restores `git fetch origin main` + `git diff --name-only origin/main...HEAD` which correctly uses the three-dot merge-base comparison for rebase-based branches. This is the correct fix — the original PR #335 had the right approach, PR #359's change was incorrect.

fuzzy added 1 commit

2026-07-08 08:52:31 +00:00

fix(ci): use pull_request.base.sha to detect Go file changes

Test and Release / test (pull_request) Successful in 23s

Details

Test and Release / lint (pull_request) Successful in 26s

Details

9765e266ef

Avoid git fetch + merge-base which fails on shallow clones.
Use the Forgejo-provided base SHA from the PR event context
to diff directly against the branch HEAD.

fuzzy dismissed the.auditor's review

2026-07-08 08:52:31 +00:00

Reason:

New commits pushed, approval review dismissed automatically according to repository settings

fuzzy added 1 commit

2026-07-08 08:57:18 +00:00

fix(ci): use fetch-depth 0 so base SHA is in clone history

Test and Release / lint (pull_request) Successful in 26s

Details

Test and Release / test (pull_request) Successful in 40s

Details

739d5fdbbd

Shallow clone (default fetch-depth=1) excludes the PR base commit,
causing 'git diff base_sha...HEAD' to fail. Set fetch-depth: 0
to get full history so the diff command can find the base SHA.

fuzzy added 1 commit

2026-07-08 08:59:29 +00:00

fix(ci): use two-dot diff with debug output, capture base SHA in variable

Test and Release / lint (pull_request) Successful in 26s

Details

Test and Release / test (pull_request) Successful in 26s

Details

0eea26615a

Switch from ... (merge-base) to .. (direct) diff. Add debug output
showing changed files. Capture git stderr so transient errors don't
break the step.

fuzzy added 1 commit

2026-07-08 09:02:08 +00:00

fix(ci): fetch base ref and use three-dot merge-base diff

Test and Release / lint (pull_request) Successful in 27s

Details

Test and Release / test (pull_request) Successful in 39s

Details

1c607720b3

With fetch-depth: 0, git merge-base works. Fetch the base branch
and diff origin/base...HEAD to find all PR changes, not just the
latest commit.

the.auditor approved these changes

2026-07-08 09:04:22 +00:00

the.auditor left a comment

Re-Review

Result: Approved — no blocking issues. Closes #358.

Changes since previous review:

Added fetch-depth: 0 to checkout step (fixes shallow clone)
Changed from origin/main to origin/${{ github.event.pull_request.base.ref }} (dynamic, works for non-main base branches)
Changed from pipe-to-grep to variable capture with 2>/dev/null || echo "" (error-safe)
Added debug echo "changed files: $FILES" for CI logs

Previous issue (rebase PRs) is now handled correctly.

## Re-Review **Result: Approved** — no blocking issues. Closes #358. **Changes since previous review:** - Added `fetch-depth: 0` to checkout step (fixes shallow clone) - Changed from `origin/main` to `origin/${{ github.event.pull_request.base.ref }}` (dynamic, works for non-main base branches) - Changed from pipe-to-grep to variable capture with `2>/dev/null || echo ""` (error-safe) - Added debug `echo "changed files: $FILES"` for CI logs Previous issue (rebase PRs) is now handled correctly.

fuzzy merged commit 1c607720b3 into main

2026-07-08 09:04:48 +00:00

fuzzy deleted branch fix/358-ci-go-changes

2026-07-08 09:04:48 +00:00