ci: fix

1 files changed, 28 insertions, 66 deletions

diff --git a/script/publish.ts b/script/publish.ts
index c8e39a4b3..d1141c8f7 100755..100644
--- a/script/publish.ts
+++ b/script/publish.ts
@@ -6,6 +6,9 @@ import { fileURLToPath } from "url"
 
 console.log("=== publishing ===\n")
 
+const dir = fileURLToPath(new URL("..", import.meta.url))
+process.chdir(dir)
+
 const tag = `v${Script.version}`
 
 const pkgjsons = await Array.fromAsync(
@@ -14,64 +17,29 @@ const pkgjsons = await Array.fromAsync(
   }),
 ).then((arr) => arr.filter((x) => !x.includes("node_modules") && !x.includes("dist")))
 
-const extensionToml = fileURLToPath(new URL("../packages/extensions/zed/extension.toml", import.meta.url))
-const publishPackageJsons = ["packages/plugin/package.json", "packages/sdk/js/package.json"]
-
-async function hasChanges() {
-  return (await $`git diff --quiet && git diff --cached --quiet`.nothrow()).exitCode !== 0
-}
-
-async function hasPublishPackageJsonChanges() {
-  if ((await $`git diff --quiet -- ${publishPackageJsons}`.nothrow()).exitCode !== 0) return true
-  return (await $`git diff --cached --quiet -- ${publishPackageJsons}`.nothrow()).exitCode !== 0
-}
-
-async function logPublishPackageJsonChanges() {
-  await $`git status --short -- ${publishPackageJsons}`
-  await $`git diff -- ${publishPackageJsons}`
-  await $`git diff --cached -- ${publishPackageJsons}`
-}
-
-async function releaseTagExists() {
-  return (await $`git rev-parse -q --verify refs/tags/${tag}`.nothrow()).exitCode === 0
-}
-
-async function prepareReleaseFiles() {
-  for (const file of pkgjsons) {
-    let pkg = await Bun.file(file).text()
-    pkg = pkg.replaceAll(/"version": "[^"]+"/g, `"version": "${Script.version}"`)
-    console.log("updated:", file)
-    await Bun.file(file).write(pkg)
-  }
-
-  let toml = await Bun.file(extensionToml).text()
-  toml = toml.replace(/^version = "[^"]+"/m, `version = "${Script.version}"`)
-  toml = toml.replaceAll(/releases\/download\/v[^/]+\//g, `releases/download/v${Script.version}/`)
-  console.log("updated:", extensionToml)
-  await Bun.file(extensionToml).write(toml)
-
-  await $`bun install`
-  await $`./packages/sdk/js/script/build.ts`
-}
-
 if (Script.release && !Script.preview) {
   await $`git fetch origin --tags`
   await $`git switch --detach`
 }
 
-await prepareReleaseFiles()
-
-if (Script.release && !Script.preview) {
-  if (await releaseTagExists()) {
-    console.log(`release tag ${tag} already exists, skipping tag creation`)
-  } else {
-    await $`git commit -am "release: ${tag}"`
-    await $`git tag ${tag}`
-    await $`git push origin refs/tags/${tag} --no-verify`
-    await new Promise((resolve) => setTimeout(resolve, 5_000))
-  }
+for (const file of pkgjsons) {
+  let pkg = await Bun.file(file).text()
+  pkg = pkg.replaceAll(/"version": "[^"]+"/g, `"version": "${Script.version}"`)
+  console.log("updated:", file)
+  await Bun.file(file).write(pkg)
 }
 
+const extensionToml = fileURLToPath(new URL("../packages/extensions/zed/extension.toml", import.meta.url))
+let toml = await Bun.file(extensionToml).text()
+toml = toml.replace(/^version = "[^"]+"/m, `version = "${Script.version}"`)
+toml = toml.replaceAll(/releases\/download\/v[^/]+\//g, `releases/download/v${Script.version}/`)
+console.log("updated:", extensionToml)
+await Bun.file(extensionToml).write(toml)
+
+await $`bun install`
+await import(`../packages/sdk/js/script/build.ts`)
+process.chdir(dir)
+
 console.log("\n=== cli ===\n")
 await import(`../packages/opencode/script/publish.ts`)
 
@@ -87,25 +55,19 @@ if (Script.release) {
 }
 
 if (Script.release && !Script.preview) {
+  process.chdir(dir)
+  await $`git commit -am "release: ${tag}"`
+  const releaseCommit = (await $`git rev-parse HEAD`.text()).trim()
+  await $`git tag -d ${tag}`.nothrow()
+  await $`git tag ${tag}`
+  await $`git push origin refs/tags/${tag} --force-with-lease --no-verify`
+  await new Promise((resolve) => setTimeout(resolve, 5_000))
   await $`git fetch origin`
-  if (await hasPublishPackageJsonChanges()) {
-    console.error("publish scripts left package.json changes before syncing dev")
-    await logPublishPackageJsonChanges()
-    throw new Error("packages/plugin/package.json or packages/sdk/js/package.json changed during publish")
-  }
   await $`git checkout -B dev origin/dev`
-  await prepareReleaseFiles()
-  if (await hasChanges()) {
-    await $`git commit -am "sync release versions for v${Script.version}"`
-    await $`git push origin HEAD:dev --no-verify`
-  } else {
-    console.log(`dev already synced for ${tag}`)
-  }
+  await $`git cherry-pick ${releaseCommit}`
+  await $`git push origin HEAD:dev --no-verify`
 }
 
 if (Script.release) {
   await $`gh release edit ${tag} --draft=false --repo ${process.env.GH_REPO}`
 }
-
-const dir = fileURLToPath(new URL("..", import.meta.url))
-process.chdir(dir)