RomanNum3ral
/
gstack
mirror of https://github.com/garrytan/gstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(land-and-deploy): specify auto-merge method

This commit is contained in:
Ryan Winkler 2026-08-09 16:09:54 +01:00
parent 94993f7401
commit 397c05f6e9
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
land-and-deploy/SKILL.md
View File

@ -1472,10 +1472,11 @@ If the user chooses A or C: Tell the user "Merging now." Continue to Step 4.
Record the start timestamp for timing data. Also record which merge path is taken
(auto-merge vs direct) for the deploy report.
Try auto-merge first (respects repo merge settings and merge queues):
Try auto-merge first (respects repo merge settings and merge queues). Specify the
merge method explicitly because `gh` requires one in non-interactive sessions:
```bash
gh pr merge --auto --delete-branch
gh pr merge --squash --auto --delete-branch
```
If `--auto` succeeds: record `MERGE_PATH=auto`. This means the repo has auto-merge enabled

5
land-and-deploy/SKILL.md.tmpl
View File

@ -595,10 +595,11 @@ If the user chooses A or C: Tell the user "Merging now." Continue to Step 4.
Record the start timestamp for timing data. Also record which merge path is taken
(auto-merge vs direct) for the deploy report.
Try auto-merge first (respects repo merge settings and merge queues):
Try auto-merge first (respects repo merge settings and merge queues). Specify the
merge method explicitly because `gh` requires one in non-interactive sessions:
```bash
gh pr merge --auto --delete-branch
gh pr merge --squash --auto --delete-branch
```
If `--auto` succeeds: record `MERGE_PATH=auto`. This means the repo has auto-merge enabled

7
test/land-and-deploy-postfail.test.ts
View File

@ -36,6 +36,13 @@ function readMd(): string {
}
describe("PR #1620 §4a-postfail in land-and-deploy template", () => {
test("auto-merge specifies a method in template and generated skill", () => {
for (const body of [readTmpl(), readMd()]) {
expect(body).toContain("gh pr merge --squash --auto --delete-branch");
expect(body).not.toContain("gh pr merge --auto --delete-branch");
}
});
test("§4a-postfail header present in template", () => {
expect(readTmpl()).toMatch(/### 4a-postfail: Post-failure PR-state check/);
});