Skip to content

Fix gh-aw upgrade and unsigned PR branch pushes #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrjf merged 3 commits into from
May 18, 2026
+220 −182
Merged

Fix gh-aw upgrade and unsigned PR branch pushes #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f99a547
Initial plan
Copilot May 18, 2026
9efc689
Fix gh-aw upgrade and unsigned push config
Copilot May 18, 2026
04af053
Address gh-aw validation feedback
Copilot May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .github/aw/actions-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
"version": "v9.0.0",
"sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
},
"github/gh-aw-actions/setup@v0.74.2": {
"github/gh-aw-actions/setup@v0.74.4": {
"repo": "github/gh-aw-actions/setup",
"version": "v0.74.2",
"sha": "23453ecc01928d28ee1e773e403b216b29e89a5b"
},
"github/gh-aw/actions/setup@v0.74.2": {
"repo": "github/gh-aw/actions/setup",
"version": "v0.74.2",
"sha": "59462bdec7dab53cd120a0931751e531c272636d"
"version": "v0.74.4",
"sha": "069305b523ecd7fbd05c5681a049b570b1fe6136"
}
}
}
136 changes: 76 additions & 60 deletions .github/workflows/autoloop.lock.yml
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions .github/workflows/autoloop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ safe-outputs:
recreate-ref: true
max: 1
push-to-pull-request-branch:
signed-commits: false
target: "*"
title-prefix: "[Autoloop"
protected-files:
Expand Down Expand Up @@ -447,10 +448,13 @@ Each run executes **one iteration for the single selected program**:
elif [ "$ahead" != "0" ] && [ "$behind" != "0" ]; then
# True divergence: branch has unique commits AND main has moved on.
git checkout -B autoloop/{program-name} origin/autoloop/{program-name}
git merge origin/main --no-edit -m "Merge main into autoloop/{program-name}"
git rebase origin/main
# If rebase conflicts occur, resolve them, run `git rebase --continue`,
# and repeat until the rebase completes.
git push --force-with-lease origin autoloop/{program-name}
else
# Already at main (ahead=0, behind=0) or only ahead of main (ahead>0,
# behind=0). Nothing to merge — just check out the branch.
# behind=0). Nothing to rebase — just check out the branch.
git checkout -B autoloop/{program-name} origin/autoloop/{program-name}
fi
else
Expand All @@ -465,8 +469,8 @@ Each run executes **one iteration for the single selected program**:
|---|---|---|---|
| 0 | 0 | checkout (nothing to do) | branch is exactly at main |
| 0 | >0 | **fast-forward + force-push** | branch's commits already in main; merging would produce noisy merge commit |
| >0 | 0 | checkout (nothing to do) | unique work preserved; no upstream drift to merge |
| >0 | >0 | checkout + merge | true divergence |
| >0 | 0 | checkout (nothing to do) | unique work preserved; no upstream drift to rebase |
| >0 | >0 | checkout + rebase + force-push | true divergence; preserves a linear branch |

Use `--force-with-lease` rather than `--force` so that if anyone else is simultaneously pushing to the branch, the update is rejected rather than overwriting their commits.
2. Make the proposed changes to the target files only.
Expand Down Expand Up @@ -914,4 +918,3 @@ The `delta` is **signed by metric direction**: for `higher`-direction programs a

> ❌ **Do NOT modify files outside the program's Target list.**
> The Target section of the program file is the allowlist. Touching anything else (including the evaluation script or the program file itself) is forbidden.

Loading
Loading