From 6cf533b748fb6b9fa82b3d4e848b5b4a449524bf Mon Sep 17 00:00:00 2001 From: Dax Raad Date: Thu, 29 Jan 2026 11:31:50 -0500 Subject: [PATCH] sync --- .github/workflows/publish.yml | 7 +++---- script/publish.ts | 21 ++++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d18989fc34..3f26a3da67 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -76,9 +76,7 @@ jobs: path: packages/opencode/dist outputs: - release: ${{ steps.build-cli.outputs.release }} - tag: ${{ steps.publish.outputs.tag }} - version: ${{ steps.publish.outputs.version }} + version: ${{ needs.version.outputs.version }} build-tauri: if: false @@ -233,7 +231,7 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - ref: ${{ needs.publish.outputs.tag }} + ref: ${{ needs.version.outputs.tag }} - uses: ./.github/actions/setup-bun @@ -263,6 +261,7 @@ jobs: - run: ./script/publish.ts env: OPENCODE_VERSION: ${{ needs.version.outputs.version }} + OPENCODE_RELEASE_ID: ${{ needs.version.outputs.release }} AUR_KEY: ${{ secrets.AUR_KEY }} GITHUB_TOKEN: ${{ secrets.SST_GITHUB_TOKEN }} OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }} diff --git a/script/publish.ts b/script/publish.ts index 636ec625c3..cdff5a06dc 100755 --- a/script/publish.ts +++ b/script/publish.ts @@ -65,17 +65,20 @@ await Bun.file(extensionToml).write(toml) await $`bun install` await import(`../packages/sdk/js/script/build.ts`) -if (!Script.preview || true) { - await $`git commit -am "release: v${Script.version}"` - await $`git tag v${Script.version}` - await $`git fetch origin` - await $`git cherry-pick HEAD..origin/dev`.nothrow() - await $`git push origin HEAD --tags --no-verify --force-with-lease` - await new Promise((resolve) => setTimeout(resolve, 5_000)) - await $`gh release edit v${Script.version} --draft --title "v${Script.version}" --notes ${notes.join("\n") || "No notable changes"}` - await $`gh release upload v${Script.version} ./packages/opencode/dist/*.zip ./packages/opencode/dist/*.tar.gz --clobber` +await $`git commit -am "release: v${Script.version}"` +await $`git tag v${Script.version}` +await $`git fetch origin` +await $`git cherry-pick HEAD..origin/dev`.nothrow() +await $`git push origin HEAD --tags --no-verify --force-with-lease` +await new Promise((resolve) => setTimeout(resolve, 5_000)) +const releaseID = process.env.OPENCODE_RELEASE_ID +if (!releaseID) { + throw new Error("OPENCODE_RELEASE_ID environment variable is required") } +await $`gh release edit ${releaseID} --draft --title "v${Script.version}" --notes ${notes.join("\n") || "No notable changes"}` +await $`gh release upload v${Script.version} ./packages/opencode/dist/*.zip ./packages/opencode/dist/*.tar.gz --clobber` + console.log("\n=== cli ===\n") await import(`../packages/opencode/script/publish.ts`)