From 09ce5c1b9ac722dd692d94eb60bca9fe562481ab Mon Sep 17 00:00:00 2001 From: Caleb Norton Date: Tue, 3 Feb 2026 03:54:19 -0600 Subject: [PATCH 1/2] feat(beta): allow commits on top of beta PRs --- script/beta.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/script/beta.ts b/script/beta.ts index 4355c5879cc9..58b4c24eeade 100755 --- a/script/beta.ts +++ b/script/beta.ts @@ -128,10 +128,15 @@ async function main() { await $`git fetch origin beta` const localTree = await $`git rev-parse beta^{tree}`.text() - const remoteTree = await $`git rev-parse origin/beta^{tree}`.text() - - if (localTree.trim() === remoteTree.trim()) { - console.log("Beta branch has identical contents, no push needed") + const remoteTrees = (await $`git log origin/dev..origin/beta --format=%T`.text()).split("\n") + + const matchIdx = remoteTrees.indexOf(localTree.trim()) + if (matchIdx !== -1) { + if (matchIdx !== 0) { + console.log(`Beta branch contains this sync, but additional commits exist after it. Leaving beta branch as is.`) + } else { + console.log("Beta branch has identical contents, no push needed") + } return } From 64380d47b844551e9ca67eff496fcd440c502d6a Mon Sep 17 00:00:00 2001 From: Caleb Norton Date: Tue, 3 Feb 2026 04:08:09 -0600 Subject: [PATCH 2/2] feat(ci): run nix-hashes on beta branch --- .github/workflows/nix-hashes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nix-hashes.yml b/.github/workflows/nix-hashes.yml index 5446f9212fba..4192c308b7fb 100644 --- a/.github/workflows/nix-hashes.yml +++ b/.github/workflows/nix-hashes.yml @@ -6,7 +6,7 @@ permissions: on: workflow_dispatch: push: - branches: [dev] + branches: [dev, beta] paths: - "bun.lock" - "package.json"