| ... | ... | @@ -28,7 +28,7 @@ permissions: |
| 28 | 28 | jobs: |
| 29 | 29 | preflight: |
| 30 | 30 | name: Preflight |
| 31 | | runs-on: ubuntu-24.04 |
| 31 | runs-on: blacksmith-8vcpu-ubuntu-2404 |
| 32 | 32 | timeout-minutes: 10 |
| 33 | 33 | outputs: |
| 34 | 34 | release_channel: ${{ steps.release_meta.outputs.release_channel }} |
| ... | ... | @@ -141,30 +141,30 @@ jobs: |
| 141 | 141 | matrix: |
| 142 | 142 | include: |
| 143 | 143 | - label: macOS arm64 |
| 144 | | runner: macos-14 |
| 144 | runner: blacksmith-12vcpu-macos-26 |
| 145 | 145 | platform: mac |
| 146 | 146 | target: dmg |
| 147 | 147 | arch: arm64 |
| 148 | 148 | - label: macOS x64 |
| 149 | | runner: macos-15-intel |
| 149 | runner: blacksmith-12vcpu-macos-26 |
| 150 | 150 | platform: mac |
| 151 | 151 | target: dmg |
| 152 | 152 | arch: x64 |
| 153 | 153 | - label: Linux x64 |
| 154 | | runner: ubuntu-24.04 |
| 154 | runner: blacksmith-32vcpu-ubuntu-2404 |
| 155 | 155 | platform: linux |
| 156 | 156 | target: AppImage |
| 157 | 157 | arch: x64 |
| 158 | 158 | - label: Windows x64 |
| 159 | | runner: windows-2022 |
| 159 | runner: blacksmith-32vcpu-windows-2025 |
| 160 | 160 | platform: win |
| 161 | 161 | target: nsis |
| 162 | 162 | arch: x64 |
| 163 | | - label: Windows arm64 |
| 164 | | runner: windows-11-arm |
| 165 | | platform: win |
| 166 | | target: nsis |
| 167 | | arch: arm64 |
| 163 | # - label: Windows arm64 |
| 164 | # runner: windows-11-arm |
| 165 | # platform: win |
| 166 | # target: nsis |
| 167 | # arch: arm64 |
| 168 | 168 | steps: |
| 169 | 169 | - name: Checkout |
| 170 | 170 | uses: actions/checkout@v6 |
| ... | ... | @@ -277,16 +277,17 @@ jobs: |
| 277 | 277 | done |
| 278 | 278 | fi |
| 279 | 279 | |
| 280 | # Enable if Windows arm64 builds are enabled. |
| 280 | 281 | # Windows updater metadata is channel-specific (for example |
| 281 | 282 | # "latest.yml" or "nightly.yml"). Suffix each per-arch copy so the |
| 282 | 283 | # release job can merge matching arm64/x64 manifests back into one |
| 283 | 284 | # canonical manifest per channel. |
| 284 | | if [[ "${{ matrix.platform }}" == "win" ]]; then |
| 285 | | shopt -s nullglob |
| 286 | | for manifest in release-publish/*.yml; do |
| 287 | | mv "$manifest" "${manifest%.yml}-win-${{ matrix.arch }}.yml" |
| 288 | | done |
| 289 | | fi |
| 285 | # if [[ "${{ matrix.platform }}" == "win" ]]; then |
| 286 | # shopt -s nullglob |
| 287 | # for manifest in release-publish/*.yml; do |
| 288 | # mv "$manifest" "${manifest%.yml}-win-${{ matrix.arch }}.yml" |
| 289 | # done |
| 290 | # fi |
| 290 | 291 | |
| 291 | 292 | - name: Upload build artifacts |
| 292 | 293 | uses: actions/upload-artifact@v7 |
| ... | ... | @@ -298,7 +299,7 @@ jobs: |
| 298 | 299 | publish_cli: |
| 299 | 300 | name: Publish CLI to npm |
| 300 | 301 | needs: [preflight, build] |
| 301 | | runs-on: ubuntu-24.04 |
| 302 | runs-on: blacksmith-8vcpu-ubuntu-2404 |
| 302 | 303 | timeout-minutes: 10 |
| 303 | 304 | steps: |
| 304 | 305 | - name: Checkout |
| ... | ... | @@ -332,7 +333,7 @@ jobs: |
| 332 | 333 | release: |
| 333 | 334 | name: Publish GitHub Release |
| 334 | 335 | needs: [preflight, build, publish_cli] |
| 335 | | runs-on: ubuntu-24.04 |
| 336 | runs-on: blacksmith-8vcpu-ubuntu-2404 |
| 336 | 337 | timeout-minutes: 10 |
| 337 | 338 | steps: |
| 338 | 339 | - name: Checkout |
| ... | ... | @@ -363,34 +364,34 @@ jobs: |
| 363 | 364 | fi |
| 364 | 365 | done |
| 365 | 366 | |
| 366 | | - name: Merge Windows updater manifests |
| 367 | | run: | |
| 368 | | shopt -s nullglob |
| 369 | | found_windows_manifest=false |
| 370 | | for x64_manifest in release-assets/*-win-x64.yml; do |
| 371 | | if [[ "$(basename "$x64_manifest")" == builder-debug-* ]]; then |
| 372 | | continue |
| 373 | | fi |
| 374 | | |
| 375 | | arm64_manifest="${x64_manifest/-x64.yml/-arm64.yml}" |
| 376 | | output_manifest="${x64_manifest/-win-x64.yml/.yml}" |
| 377 | | if [[ ! -f "$arm64_manifest" ]]; then |
| 378 | | echo "Missing matching arm64 Windows manifest for $x64_manifest" >&2 |
| 379 | | exit 1 |
| 380 | | fi |
| 381 | | |
| 382 | | found_windows_manifest=true |
| 383 | | node scripts/merge-update-manifests.ts --platform win \ |
| 384 | | "$arm64_manifest" \ |
| 385 | | "$x64_manifest" \ |
| 386 | | "$output_manifest" |
| 387 | | rm -f "$arm64_manifest" "$x64_manifest" |
| 388 | | done |
| 389 | | |
| 390 | | if [[ "$found_windows_manifest" != true ]]; then |
| 391 | | echo "No Windows updater manifests found to merge." >&2 |
| 392 | | exit 1 |
| 393 | | fi |
| 367 | # - name: Merge Windows updater manifests |
| 368 | # run: | |
| 369 | # shopt -s nullglob |
| 370 | # found_windows_manifest=false |
| 371 | # for x64_manifest in release-assets/*-win-x64.yml; do |
| 372 | # if [[ "$(basename "$x64_manifest")" == builder-debug-* ]]; then |
| 373 | # continue |
| 374 | # fi |
| 375 | |
| 376 | # arm64_manifest="${x64_manifest/-x64.yml/-arm64.yml}" |
| 377 | # output_manifest="${x64_manifest/-win-x64.yml/.yml}" |
| 378 | # if [[ ! -f "$arm64_manifest" ]]; then |
| 379 | # echo "Missing matching arm64 Windows manifest for $x64_manifest" >&2 |
| 380 | # exit 1 |
| 381 | # fi |
| 382 | |
| 383 | # found_windows_manifest=true |
| 384 | # node scripts/merge-update-manifests.ts --platform win \ |
| 385 | # "$arm64_manifest" \ |
| 386 | # "$x64_manifest" \ |
| 387 | # "$output_manifest" |
| 388 | # rm -f "$arm64_manifest" "$x64_manifest" |
| 389 | # done |
| 390 | |
| 391 | # if [[ "$found_windows_manifest" != true ]]; then |
| 392 | # echo "No Windows updater manifests found to merge." >&2 |
| 393 | # exit 1 |
| 394 | # fi |
| 394 | 395 | |
| 395 | 396 | - name: Publish release |
| 396 | 397 | if: needs.preflight.outputs.previous_tag != '' |
| ... | ... | @@ -435,7 +436,7 @@ jobs: |
| 435 | 436 | name: Finalize release |
| 436 | 437 | if: needs.preflight.outputs.release_channel == 'stable' |
| 437 | 438 | needs: [preflight, release] |
| 438 | | runs-on: ubuntu-24.04 |
| 439 | runs-on: blacksmith-8vcpu-ubuntu-2404 |
| 439 | 440 | timeout-minutes: 10 |
| 440 | 441 | steps: |
| 441 | 442 | - id: app_token |