ToothFairyAI_Public/tf_code
1
0
Fork 0
mirror of https://gitea.toothfairyai.com/ToothFairyAI/tf_code.git synced 2026-03-30 05:43:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci

Browse Source
This commit is contained in:
Dax Raad 2026-01-30 10:12:29 -05:00
parent 5e823fd208
commit 4a4fc48ee8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
script/beta.ts
View File

@ -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}`)