From ea67a3f844a990b2f1531c5b6b1338feabfdafb3 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Thu, 16 Apr 2026 19:51:47 -0700 Subject: [PATCH 1/3] try out blacksmith for releases --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3ad2d93548..7d2cb7479a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: jobs: quality: name: Format, Lint, Typecheck, Test, Browser Test, Build - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: blacksmith-8vcpu-ubuntu-2404 timeout-minutes: 10 steps: - name: Checkout @@ -76,7 +76,7 @@ jobs: release_smoke: name: Release Smoke - runs-on: ubuntu-24.04 + runs-on: blacksmith-8vcpu-ubuntu-2404 timeout-minutes: 10 steps: - name: Checkout diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f61235ae8d..202a60241b7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ permissions: jobs: preflight: name: Preflight - runs-on: ubuntu-24.04 + runs-on: blacksmith-8vcpu-ubuntu-2404 timeout-minutes: 10 outputs: release_channel: ${{ steps.release_meta.outputs.release_channel }} @@ -141,7 +141,7 @@ jobs: matrix: include: - label: macOS arm64 - runner: macos-14 + runner: blacksmith-12vcpu-macos-26 platform: mac target: dmg arch: arm64 @@ -151,12 +151,12 @@ jobs: target: dmg arch: x64 - label: Linux x64 - runner: ubuntu-24.04 + runner: blacksmith-32vcpu-ubuntu-2404 platform: linux target: AppImage arch: x64 - label: Windows x64 - runner: windows-2022 + runner: blacksmith-32vcpu-windows-2025 platform: win target: nsis arch: x64 @@ -298,7 +298,7 @@ jobs: publish_cli: name: Publish CLI to npm needs: [preflight, build] - runs-on: ubuntu-24.04 + runs-on: blacksmith-8vcpu-ubuntu-2404 timeout-minutes: 10 steps: - name: Checkout @@ -332,7 +332,7 @@ jobs: release: name: Publish GitHub Release needs: [preflight, build, publish_cli] - runs-on: ubuntu-24.04 + runs-on: blacksmith-8vcpu-ubuntu-2404 timeout-minutes: 10 steps: - name: Checkout @@ -435,7 +435,7 @@ jobs: name: Finalize release if: needs.preflight.outputs.release_channel == 'stable' needs: [preflight, release] - runs-on: ubuntu-24.04 + runs-on: blacksmith-8vcpu-ubuntu-2404 timeout-minutes: 10 steps: - id: app_token From 6b122a69e29c769e176636b20fa15f4fa8d859d3 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Thu, 16 Apr 2026 20:06:03 -0700 Subject: [PATCH 2/3] build x64 mac on arm --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 202a60241b7..b911bb3d15b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,7 +146,7 @@ jobs: target: dmg arch: arm64 - label: macOS x64 - runner: macos-15-intel + runner: blacksmith-12vcpu-macos-26 platform: mac target: dmg arch: x64 From 35af9a9a3b5ad18e679c7fbeddf05fbef20611a9 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Thu, 16 Apr 2026 20:07:55 -0700 Subject: [PATCH 3/3] disable windwos arm --- .github/workflows/release.yml | 79 ++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b911bb3d15b..1cf200051b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -160,11 +160,11 @@ jobs: platform: win target: nsis arch: x64 - - label: Windows arm64 - runner: windows-11-arm - platform: win - target: nsis - arch: arm64 + # - label: Windows arm64 + # runner: windows-11-arm + # platform: win + # target: nsis + # arch: arm64 steps: - name: Checkout uses: actions/checkout@v6 @@ -277,16 +277,17 @@ jobs: done fi + # Enable if Windows arm64 builds are enabled. # Windows updater metadata is channel-specific (for example # "latest.yml" or "nightly.yml"). Suffix each per-arch copy so the # release job can merge matching arm64/x64 manifests back into one # canonical manifest per channel. - if [[ "${{ matrix.platform }}" == "win" ]]; then - shopt -s nullglob - for manifest in release-publish/*.yml; do - mv "$manifest" "${manifest%.yml}-win-${{ matrix.arch }}.yml" - done - fi + # if [[ "${{ matrix.platform }}" == "win" ]]; then + # shopt -s nullglob + # for manifest in release-publish/*.yml; do + # mv "$manifest" "${manifest%.yml}-win-${{ matrix.arch }}.yml" + # done + # fi - name: Upload build artifacts uses: actions/upload-artifact@v7 @@ -363,34 +364,34 @@ jobs: fi done - - name: Merge Windows updater manifests - run: | - shopt -s nullglob - found_windows_manifest=false - for x64_manifest in release-assets/*-win-x64.yml; do - if [[ "$(basename "$x64_manifest")" == builder-debug-* ]]; then - continue - fi - - arm64_manifest="${x64_manifest/-x64.yml/-arm64.yml}" - output_manifest="${x64_manifest/-win-x64.yml/.yml}" - if [[ ! -f "$arm64_manifest" ]]; then - echo "Missing matching arm64 Windows manifest for $x64_manifest" >&2 - exit 1 - fi - - found_windows_manifest=true - node scripts/merge-update-manifests.ts --platform win \ - "$arm64_manifest" \ - "$x64_manifest" \ - "$output_manifest" - rm -f "$arm64_manifest" "$x64_manifest" - done - - if [[ "$found_windows_manifest" != true ]]; then - echo "No Windows updater manifests found to merge." >&2 - exit 1 - fi + # - name: Merge Windows updater manifests + # run: | + # shopt -s nullglob + # found_windows_manifest=false + # for x64_manifest in release-assets/*-win-x64.yml; do + # if [[ "$(basename "$x64_manifest")" == builder-debug-* ]]; then + # continue + # fi + + # arm64_manifest="${x64_manifest/-x64.yml/-arm64.yml}" + # output_manifest="${x64_manifest/-win-x64.yml/.yml}" + # if [[ ! -f "$arm64_manifest" ]]; then + # echo "Missing matching arm64 Windows manifest for $x64_manifest" >&2 + # exit 1 + # fi + + # found_windows_manifest=true + # node scripts/merge-update-manifests.ts --platform win \ + # "$arm64_manifest" \ + # "$x64_manifest" \ + # "$output_manifest" + # rm -f "$arm64_manifest" "$x64_manifest" + # done + + # if [[ "$found_windows_manifest" != true ]]; then + # echo "No Windows updater manifests found to merge." >&2 + # exit 1 + # fi - name: Publish release if: needs.preflight.outputs.previous_tag != ''