diff options
| -rw-r--r-- | .github/actions/setup-bun/action.yml | 56 | ||||
| -rw-r--r-- | .github/workflows/publish.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/sign-cli.yml | 4 | ||||
| -rw-r--r-- | packages/desktop/scripts/utils.ts | 2 | ||||
| -rwxr-xr-x | packages/opencode/script/build.ts | 7 |
5 files changed, 62 insertions, 11 deletions
diff --git a/.github/actions/setup-bun/action.yml b/.github/actions/setup-bun/action.yml index 47267775c..e7966cb48 100644 --- a/.github/actions/setup-bun/action.yml +++ b/.github/actions/setup-bun/action.yml @@ -1,5 +1,10 @@ name: "Setup Bun" description: "Setup Bun with caching and install dependencies" +inputs: + cross-compile: + description: "Pre-cache canary cross-compile binaries for all targets" + required: false + default: "false" runs: using: "composite" steps: @@ -16,13 +21,12 @@ runs: shell: bash run: | if [ "$RUNNER_ARCH" = "X64" ]; then - V=$(node -p "require('./package.json').packageManager.split('@')[1]") case "$RUNNER_OS" in macOS) OS=darwin ;; Linux) OS=linux ;; Windows) OS=windows ;; esac - echo "url=https://bun.sh/download/${V}/${OS}/x64?avx2=false&profile=false" >> "$GITHUB_OUTPUT" + echo "url=https://github.com/oven-sh/bun/releases/download/canary/bun-${OS}-x64-baseline.zip" >> "$GITHUB_OUTPUT" fi - name: Setup Bun @@ -31,6 +35,54 @@ runs: bun-version-file: ${{ !steps.bun-url.outputs.url && 'package.json' || '' }} bun-download-url: ${{ steps.bun-url.outputs.url }} + - name: Pre-cache canary cross-compile binaries + if: inputs.cross-compile == 'true' + shell: bash + run: | + BUN_VERSION=$(bun --revision) + if echo "$BUN_VERSION" | grep -q "canary"; then + SEMVER=$(echo "$BUN_VERSION" | sed 's/^\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/') + echo "Bun version: $BUN_VERSION (semver: $SEMVER)" + CACHE_DIR="$HOME/.bun/install/cache" + mkdir -p "$CACHE_DIR" + TMP_DIR=$(mktemp -d) + for TARGET in linux-aarch64 linux-x64 linux-x64-baseline linux-aarch64-musl linux-x64-musl linux-x64-musl-baseline darwin-aarch64 darwin-x64 windows-x64 windows-x64-baseline; do + DEST="$CACHE_DIR/bun-${TARGET}-v${SEMVER}" + if [ -f "$DEST" ]; then + echo "Already cached: $DEST" + continue + fi + URL="https://github.com/oven-sh/bun/releases/download/canary/bun-${TARGET}.zip" + echo "Downloading $TARGET from $URL" + if curl -sfL -o "$TMP_DIR/bun.zip" "$URL"; then + unzip -qo "$TMP_DIR/bun.zip" -d "$TMP_DIR" + if echo "$TARGET" | grep -q "windows"; then + BIN_NAME="bun.exe" + else + BIN_NAME="bun" + fi + mv "$TMP_DIR/bun-${TARGET}/$BIN_NAME" "$DEST" + chmod +x "$DEST" + rm -rf "$TMP_DIR/bun-${TARGET}" "$TMP_DIR/bun.zip" + echo "Cached: $DEST" + # baseline bun resolves "bun-darwin-x64" to the baseline cache key + # so copy the modern binary there too + if [ "$TARGET" = "darwin-x64" ]; then + BASELINE_DEST="$CACHE_DIR/bun-darwin-x64-baseline-v${SEMVER}" + if [ ! -f "$BASELINE_DEST" ]; then + cp "$DEST" "$BASELINE_DEST" + echo "Cached (baseline alias): $BASELINE_DEST" + fi + fi + else + echo "Skipped: $TARGET (not available)" + fi + done + rm -rf "$TMP_DIR" + else + echo "Not a canary build ($BUN_VERSION), skipping pre-cache" + fi + - name: Install dependencies run: bun install shell: bash diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8d4c9038a..cca7df5c4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -77,6 +77,8 @@ jobs: fetch-tags: true - uses: ./.github/actions/setup-bun + with: + cross-compile: "true" - name: Setup git committer id: committer @@ -88,7 +90,7 @@ jobs: - name: Build id: build run: | - ./packages/opencode/script/build.ts + ./packages/opencode/script/build.ts --all env: OPENCODE_VERSION: ${{ needs.version.outputs.version }} OPENCODE_RELEASE: ${{ needs.version.outputs.release }} diff --git a/.github/workflows/sign-cli.yml b/.github/workflows/sign-cli.yml index d9d61fd80..891762231 100644 --- a/.github/workflows/sign-cli.yml +++ b/.github/workflows/sign-cli.yml @@ -20,10 +20,12 @@ jobs: fetch-tags: true - uses: ./.github/actions/setup-bun + with: + cross-compile: "true" - name: Build run: | - ./packages/opencode/script/build.ts + ./packages/opencode/script/build.ts --all - name: Upload unsigned Windows CLI id: upload_unsigned_windows_cli diff --git a/packages/desktop/scripts/utils.ts b/packages/desktop/scripts/utils.ts index 2629eb466..f6ea7009c 100644 --- a/packages/desktop/scripts/utils.ts +++ b/packages/desktop/scripts/utils.ts @@ -8,7 +8,7 @@ export const SIDECAR_BINARIES: Array<{ rustTarget: string; ocBinary: string; ass }, { rustTarget: "x86_64-apple-darwin", - ocBinary: "opencode-darwin-x64-baseline", + ocBinary: "opencode-darwin-x64", assetExt: "zip", }, { diff --git a/packages/opencode/script/build.ts b/packages/opencode/script/build.ts index 34e80d71a..19353b67f 100755 --- a/packages/opencode/script/build.ts +++ b/packages/opencode/script/build.ts @@ -56,7 +56,7 @@ const migrations = await Promise.all( ) console.log(`Loaded ${migrations.length} migrations`) -const singleFlag = process.argv.includes("--single") +const singleFlag = process.argv.includes("--single") || (!!process.env.CI && !process.argv.includes("--all")) const baselineFlag = process.argv.includes("--baseline") const skipInstall = process.argv.includes("--skip-install") @@ -104,11 +104,6 @@ const allTargets: { arch: "x64", }, { - os: "darwin", - arch: "x64", - avx2: false, - }, - { os: "win32", arch: "x64", }, |