mirror of
https://github.com/anomalyco/opencode.git
synced 2026-04-28 12:39:43 +00:00
ci
This commit is contained in:
parent
5e823fd208
commit
4a4fc48ee8
1 changed files with 2 additions and 2 deletions
|
|
@ -49,9 +49,9 @@ async function main() {
|
|||
continue
|
||||
}
|
||||
|
||||
// Try to squash merge the PR directly
|
||||
// Try to squash merge the PR directly (allow unrelated histories since beta starts fresh from dev)
|
||||
console.log(` Attempting to merge PR #${pr.number}...`)
|
||||
const merge = await $`git merge --squash pr-${pr.number}`.nothrow()
|
||||
const merge = await $`git merge --squash --allow-unrelated-histories pr-${pr.number}`.nothrow()
|
||||
if (merge.exitCode !== 0) {
|
||||
console.log(` Squash merge failed for PR #${pr.number}`)
|
||||
console.log(` Error: ${merge.stderr}`)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue