feat: add beta branch sync workflow for contributor PRs

Author: thdxr

.github/workflows/beta-sync.yml

@@ -0,0 +1,38 @@
+name: beta-sync
+
+on:
+  push:
+    branches: [dev]
+  pull_request_target:
+    types: [opened, synchronize, labeled, unlabeled]
+    branches: [dev]
+
+jobs:
+  sync-beta:
+    if: |
+      github.event_name == 'push' || 
+      (github.event_name == 'pull_request_target' && 
+       contains(github.event.pull_request.labels.*.name, 'contributor'))
+    runs-on: blacksmith-4vcpu-ubuntu-2404
+    permissions:
+      contents: write
+      pull-requests: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup Bun
+        uses: ./.github/actions/setup-bun
+
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Sync beta branch
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bun script/beta-sync.ts

script/beta-sync.ts

@@ -0,0 +1,149 @@
+#!/usr/bin/env bun
+
+interface PR {
+  number: number
+  headRefName: string
+  headRefOid: string
+  createdAt: string
+  isDraft: boolean
+  title: string
+}
+
+async function main() {
+  const token = process.env.GITHUB_TOKEN
+  if (!token) throw new Error("GITHUB_TOKEN not set")
+
+  const repo = process.env.GITHUB_REPOSITORY
+  if (!repo) throw new Error("GITHUB_REPOSITORY not set")
+
+  const [owner, repoName] = repo.split("/")
+
+  console.log("Fetching open contributor PRs...")
+
+  const prsQuery = `
+    query($owner: String!, $repo: String!, $labels: [String!]) {
+      repository(owner: $owner, name: $repo) {
+        pullRequests(
+          states: OPEN, 
+          labels: $labels, 
+          first: 100, 
+          orderBy: {field: CREATED_AT, direction: ASC}
+        ) {
+          nodes {
+            number
+            headRefName
+            headRefOid
+            createdAt
+            isDraft
+            title
+          }
+        }
+      }
+    }
+  `
+
+  const queryResult = await fetch("https://api.github.com/graphql", {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      query: prsQuery,
+      variables: { owner, repo: repoName, labels: ["contributor"] },
+    }),
+  }).then((x) => x.json())
+
+  if (queryResult.errors) {
+    console.error("GraphQL errors:", queryResult.errors)
+    throw new Error("Failed to fetch PRs")
+  }
+
+  const allPRs: PR[] = queryResult.data.repository.pullRequests.nodes
+
+  const prs = allPRs.filter((pr) => !pr.isDraft)
+
+  console.log(`Found ${prs.length} open non-draft contributor PRs`)
+
+  console.log("Fetching latest dev branch...")
+  const fetchDev = await $`git fetch origin dev`.nothrow()
+  if (fetchDev.exitCode !== 0) {
+    throw new Error(`Failed to fetch dev branch: ${fetchDev.stderr}`)
+  }
+
+  console.log("Checking out beta branch...")
+  const checkoutBeta = await $`git checkout -B beta origin/dev`.nothrow()
+  if (checkoutBeta.exitCode !== 0) {
+    throw new Error(`Failed to checkout beta branch: ${checkoutBeta.stderr}`)
+  }
+
+  const applied: number[] = []
+  const skipped: Array<{ number: number; reason: string }> = []
+
+  for (const pr of prs) {
+    console.log(`\nProcessing PR #${pr.number}: ${pr.title}`)
+
+    const fetchPR = await $`git fetch origin pull/${pr.number}/head:pr-${pr.number}`.nothrow()
+    if (fetchPR.exitCode !== 0) {
+      console.log(`  Failed to fetch PR #${pr.number}, skipping`)
+      skipped.push({ number: pr.number, reason: "Failed to fetch" })
+      continue
+    }
+
+    const cherryPick = await $`git cherry-pick ${pr.headRefOid} --no-commit`.nothrow()
+    if (cherryPick.exitCode !== 0) {
+      console.log(`  PR #${pr.number} introduces conflicts, skipping`)
+      await $`git cherry-pick --abort`.nothrow()
+      await $`git checkout -- .`.nothrow()
+      await $`git clean -fd`.nothrow()
+      skipped.push({ number: pr.number, reason: "Merge conflict" })
+      continue
+    }
+
+    const commit = await $`git commit -m "Apply PR #${pr.number}: ${pr.title}"`.nothrow()
+    if (commit.exitCode !== 0) {
+      console.log(`  Failed to commit PR #${pr.number}, skipping`)
+      await $`git reset --hard HEAD`.nothrow()
+      skipped.push({ number: pr.number, reason: "Failed to commit" })
+      continue
+    }
+
+    console.log(`  Successfully applied PR #${pr.number}`)
+    applied.push(pr.number)
+  }
+
+  console.log("\n--- Summary ---")
+  console.log(`Applied: ${applied.length} PRs`)
+  applied.forEach((num) => console.log(`  - PR #${num}`))
+  console.log(`Skipped: ${skipped.length} PRs`)
+  skipped.forEach((x) => console.log(`  - PR #${x.number}: ${x.reason}`))
+
+  console.log("\nForce pushing beta branch...")
+  const push = await $`git push origin beta --force`.nothrow()
+  if (push.exitCode !== 0) {
+    throw new Error(`Failed to push beta branch: ${push.stderr}`)
+  }
+
+  console.log("Successfully synced beta branch")
+}
+
+main().catch((err) => {
+  console.error("Error:", err)
+  process.exit(1)
+})
+
+function $(strings: TemplateStringsArray, ...values: unknown[]) {
+  const cmd = strings.reduce((acc, str, i) => acc + str + (values[i] ?? ""), "")
+  return {
+    async nothrow() {
+      const proc = Bun.spawn(cmd.split(" "), {
+        stdout: "pipe",
+        stderr: "pipe",
+      })
+      const exitCode = await proc.exited
+      const stdout = await new Response(proc.stdout).text()
+      const stderr = await new Response(proc.stderr).text()
+      return { exitCode, stdout, stderr }
+    },
+  }
+}