From 888761645751f5e3916567c0447df98274df1187 Mon Sep 17 00:00:00 2001 From: Aiden Cline Date: Sun, 9 Nov 2025 12:47:36 -0600 Subject: [PATCH] ci: sync zed --- .github/workflows/sync-zed-extension.yml | 22 ++--- script/sync-zed.ts | 106 +++++++++++++++++++++++ 2 files changed, 118 insertions(+), 10 deletions(-) create mode 100644 script/sync-zed.ts diff --git a/.github/workflows/sync-zed-extension.yml b/.github/workflows/sync-zed-extension.yml index f8ffe873..c9dea7bb 100644 --- a/.github/workflows/sync-zed-extension.yml +++ b/.github/workflows/sync-zed-extension.yml @@ -11,22 +11,24 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - if: github.event_name == 'workflow_dispatch' with: fetch-depth: 0 - - name: Get latest version tag - if: github.event_name == 'workflow_dispatch' + - uses: ./.github/actions/setup-bun + + - name: Get version tag id: get_tag run: | - TAG=$(git tag --list 'v[0-9]*.*' --sort=-version:refname | head -n 1) + if [ "${{ github.event_name }}" = "release" ]; then + TAG="${{ github.event.release.tag_name }}" + else + TAG=$(git tag --list 'v[0-9]*.*' --sort=-version:refname | head -n 1) + fi echo "tag=${TAG}" >> $GITHUB_OUTPUT echo "Using tag: ${TAG}" - - uses: huacnlee/zed-extension-action@6a168731f1d994905eeb552b3b42b0cb6c4d12e6 - with: - extension-name: opencode - push-to: sst/zed-extensions - tag-name: ${{ github.event.release.tag_name || steps.get_tag.outputs.tag }} + - name: Sync Zed extension + run: | + ./script/sync-zed.ts ${{ steps.get_tag.outputs.tag }} env: - COMMITTER_TOKEN: ${{ secrets.SST_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.SST_GITHUB_TOKEN }} diff --git a/script/sync-zed.ts b/script/sync-zed.ts new file mode 100644 index 00000000..35d1b753 --- /dev/null +++ b/script/sync-zed.ts @@ -0,0 +1,106 @@ +#!/usr/bin/env bun + +import { $ } from "bun" +import { tmpdir } from "os" +import { join } from "path" + +const FORK_REPO = "sst/zed-extensions" +const UPSTREAM_REPO = "zed-industries/extensions" +const EXTENSION_NAME = "opencode" +const OPENCODE_REPO = "sst/opencode" + +async function main() { + const version = process.argv[2] + if (!version) throw new Error("Version argument required: bun script/sync-zed.ts v1.0.52") + + const token = process.env.GITHUB_TOKEN + if (!token) throw new Error("GITHUB_TOKEN environment variable required") + + const cleanVersion = version.replace(/^v/, "") + console.log(`📦 Syncing Zed extension for version ${cleanVersion}`) + + // Get the commit SHA for this version tag + const commitSha = await $`git rev-parse ${version}`.text() + const sha = commitSha.trim() + console.log(`🔍 Found commit SHA: ${sha}`) + + // Read the extension.toml from this commit to verify version + const extensionToml = await $`git show ${version}:packages/extensions/zed/extension.toml`.text() + const parsed = Bun.TOML.parse(extensionToml) as { version: string } + const extensionVersion = parsed.version + + if (extensionVersion !== cleanVersion) { + throw new Error(`Version mismatch: extension.toml has ${extensionVersion} but tag is ${cleanVersion}`) + } + console.log(`✅ Version ${extensionVersion} matches tag`) + + // Clone the fork to a temp directory + const workDir = join(tmpdir(), `zed-extensions-${Date.now()}`) + console.log(`📁 Working in ${workDir}`) + + await $`git clone https://x-access-token:${token}@github.com/${FORK_REPO}.git ${workDir}` + process.chdir(workDir) + + // Sync fork with upstream + console.log(`🔄 Syncing fork with upstream...`) + await $`git remote add upstream https://github.com/${UPSTREAM_REPO}.git` + await $`git fetch upstream` + await $`git checkout main` + await $`git merge upstream/main --ff-only` + await $`git push origin main` + console.log(`✅ Fork synced`) + + // Create a new branch + const branchName = `update-${EXTENSION_NAME}-${cleanVersion}` + console.log(`🌿 Creating branch ${branchName}`) + await $`git checkout -b ${branchName}` + + // Update the submodule for opencode extension + const submodulePath = `extensions/${EXTENSION_NAME}` + console.log(`📌 Updating submodule to commit ${sha}`) + await $`git submodule update --init ${submodulePath}` + process.chdir(submodulePath) + await $`git fetch` + await $`git checkout ${sha}` + process.chdir(workDir) + await $`git add ${submodulePath}` + + // Update extensions.toml + console.log(`📝 Updating extensions.toml`) + const extensionsTomlPath = "extensions.toml" + const extensionsToml = await Bun.file(extensionsTomlPath).text() + + // Update version field for opencode extension + const versionRegex = new RegExp(`(\\[${EXTENSION_NAME}\\]\\s+(?:.*\\s*)?)version = "[^"]+"`) + const updatedToml = extensionsToml.replace(versionRegex, `$1version = "${cleanVersion}"`) + + await Bun.write(extensionsTomlPath, updatedToml) + await $`git add extensions.toml` + + // Commit changes + const commitMessage = `Update ${EXTENSION_NAME} to v${cleanVersion} + +Release notes: + +https://github.com/${OPENCODE_REPO}/releases/tag/v${cleanVersion}` + + await $`git commit -m ${commitMessage}` + console.log(`✅ Changes committed`) + + // Push to fork + console.log(`🚀 Pushing to fork...`) + await $`git push https://x-access-token:${token}@github.com/${FORK_REPO}.git ${branchName}` + + // Create PR using gh CLI + console.log(`📬 Creating pull request...`) + const prUrl = + await $`gh pr create --repo ${UPSTREAM_REPO} --base main --head ${FORK_REPO.split("/")[0]}:${branchName} --title "Update ${EXTENSION_NAME} to v${cleanVersion}" --body "Release notes:\n\nhttps://github.com/${OPENCODE_REPO}/releases/tag/v${cleanVersion}"`.text() + + console.log(`✅ Pull request created: ${prUrl}`) + console.log(`🎉 Done!`) +} + +main().catch((err) => { + console.error("❌ Error:", err.message) + process.exit(1) +})