monadical/opencode
13
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

ci

Browse Source
This commit is contained in:
Dax Raad
2026-01-30 10:20:49 -05:00
parent 0a0b54aa4b
commit 0d53f34c43
1 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
script/beta.ts
View File

@@ -49,33 +49,50 @@ async function main() {
continue continue
} }
// Try to squash merge the PR directly (allow unrelated histories since beta starts fresh from dev) // Get diff from PR base to PR head and apply it
console.log(` Attempting to merge PR #${pr.number}...`) console.log(` Getting diff for PR #${pr.number}...`)
const merge = await $`git merge --squash --allow-unrelated-histories pr-${pr.number}`.nothrow() const diff = await $`git diff HEAD...pr-${pr.number}`.nothrow()
if (merge.exitCode !== 0) { if (diff.exitCode !== 0) {
console.log(` Squash merge failed for PR #${pr.number}`) console.log(` Failed to get diff for PR #${pr.number}`)
console.log(` Error: ${merge.stderr}`) console.log(` Error: ${diff.stderr}`)
await $`git reset --hard HEAD`.nothrow() skipped.push({ number: pr.number, reason: `Failed to get diff: ${diff.stderr}` })
skipped.push({ number: pr.number, reason: `Squash merge failed: ${merge.stderr}` })
continue continue
} }
if (!diff.stdout.trim()) {
console.log(` No changes in PR #${pr.number}, skipping`)
skipped.push({ number: pr.number, reason: "No changes" })
continue
}
// Apply the diff
console.log(` Applying diff for PR #${pr.number}...`)
const apply = await Bun.spawn(["git", "apply"], {
stdin: new TextEncoder().encode(diff.stdout),
stdout: "pipe",
stderr: "pipe",
})
const applyExit = await apply.exited
const applyStderr = await Bun.readableStreamToText(apply.stderr)
if (applyExit !== 0) {
console.log(` Failed to apply diff for PR #${pr.number}`)
console.log(` Error: ${applyStderr}`)
await $`git checkout -- .`.nothrow()
skipped.push({ number: pr.number, reason: `Failed to apply diff: ${applyStderr}` })
continue
}
// Stage all changes
const add = await $`git add -A`.nothrow() const add = await $`git add -A`.nothrow()
if (add.exitCode !== 0) { if (add.exitCode !== 0) {
console.log(` Failed to stage changes for PR #${pr.number}`) console.log(` Failed to stage changes for PR #${pr.number}`)
await $`git reset --hard HEAD`.nothrow() await $`git checkout -- .`.nothrow()
skipped.push({ number: pr.number, reason: "Failed to stage" }) skipped.push({ number: pr.number, reason: "Failed to stage" })
continue continue
} }
const status = await $`git status --porcelain`.nothrow() // Commit
if (status.exitCode !== 0 || !status.stdout.trim()) {
console.log(` No changes to commit for PR #${pr.number}, skipping`)
await $`git reset --hard HEAD`.nothrow()
skipped.push({ number: pr.number, reason: "No changes to commit" })
continue
}
const commitMsg = `Apply PR #${pr.number}: ${pr.title}` const commitMsg = `Apply PR #${pr.number}: ${pr.title}`
const commit = await Bun.spawn(["git", "commit", "-m", commitMsg], { stdout: "pipe", stderr: "pipe" }) const commit = await Bun.spawn(["git", "commit", "-m", commitMsg], { stdout: "pipe", stderr: "pipe" })
const commitExit = await commit.exited const commitExit = await commit.exited
@@ -84,7 +101,7 @@ async function main() {
if (commitExit !== 0) { if (commitExit !== 0) {
console.log(` Failed to commit PR #${pr.number}`) console.log(` Failed to commit PR #${pr.number}`)
console.log(` Error: ${commitStderr}`) console.log(` Error: ${commitStderr}`)
await $`git reset --hard HEAD`.nothrow() await $`git checkout -- .`.nothrow()
skipped.push({ number: pr.number, reason: `Commit failed: ${commitStderr}` }) skipped.push({ number: pr.number, reason: `Commit failed: ${commitStderr}` })
continue continue
} }