Skip to content

Commit f6c1a14

Browse files
ci: broaden macOS runners, add Linux runner toggle
- Remove `studio` label pin from macOS jobs in test.yml and release.yml, allowing jobs to schedule on any [macOS, ARM64] self-hosted runner - Add `linux-runner` workflow_dispatch input to both workflows with fallback to vanilla `blacksmith-4vcpu-ubuntu-2404` for safe rollback - Keep deno-lint and vitest on vanilla runner (no migration without measured benefit) - Update docs/builds.md runner references - Windows CI unchanged Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent b92b2d0 commit f6c1a14

3 files changed

Lines changed: 24 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ on:
1313
- macos
1414
- linux
1515
- windows
16+
linux-runner:
17+
description: 'Linux runner label (custom image or vanilla fallback)'
18+
required: false
19+
default: 'blacksmith-4vcpu-ubuntu-2404'
20+
type: choice
21+
options:
22+
- blacksmith-4vcpu-ubuntu-2404
23+
- blacksmith-4vcpu-ubuntu-2404-mt
1624
release:
1725
types: [published]
1826

@@ -32,7 +40,7 @@ jobs:
3240
if: >
3341
github.event_name == 'release' ||
3442
inputs.platform == 'all' || inputs.platform == 'macos' || inputs.platform == ''
35-
runs-on: [macOS, ARM64, studio]
43+
runs-on: [macOS, ARM64]
3644
timeout-minutes: 30
3745

3846
steps:
@@ -114,7 +122,7 @@ jobs:
114122
if: >
115123
github.event_name == 'release' ||
116124
inputs.platform == 'all' || inputs.platform == 'linux' || inputs.platform == ''
117-
runs-on: blacksmith-4vcpu-ubuntu-2404
125+
runs-on: ${{ inputs.linux-runner || 'blacksmith-4vcpu-ubuntu-2404' }}
118126
timeout-minutes: 30
119127

120128
steps:

.github/workflows/test.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ name: Test
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
linux-runner:
7+
description: 'Linux runner label (custom image or vanilla fallback)'
8+
required: false
9+
default: 'blacksmith-4vcpu-ubuntu-2404'
10+
type: choice
11+
options:
12+
- blacksmith-4vcpu-ubuntu-2404
13+
- blacksmith-4vcpu-ubuntu-2404-mt
514
pull_request:
615
paths:
716
- 'crates/**'
@@ -28,7 +37,7 @@ env:
2837
jobs:
2938
rust:
3039
name: Rust Lint, Format, and Test
31-
runs-on: [macOS, ARM64, studio]
40+
runs-on: [macOS, ARM64]
3241
timeout-minutes: 20
3342
env:
3443
CARGO_INCREMENTAL: 1
@@ -100,10 +109,10 @@ jobs:
100109
matrix:
101110
include:
102111
- platform: macos
103-
os: [macOS, ARM64, studio]
112+
os: [macOS, ARM64]
104113
target: aarch64-apple-darwin
105114
- platform: linux
106-
os: blacksmith-4vcpu-ubuntu-2404
115+
os: ${{ inputs.linux-runner || 'blacksmith-4vcpu-ubuntu-2404' }}
107116
target: x86_64-unknown-linux-gnu
108117
- platform: windows
109118
os: [self-hosted, Windows, X64]

docs/builds.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Build configuration, performance tuning, signing, and distribution for mt.
77
| Platform | Architecture | Runner | Bundle |
88
| ---------- | ------------- | -------- | -------- |
99
| macOS | ARM64 | Self-hosted `[macOS, ARM64]` | `.app`, `.dmg` |
10-
| Linux | amd64 | `ubuntu-latest` (CI) or Docker (`Dockerfile.linux-amd64`) | `.deb` |
10+
| Linux | amd64 | Blacksmith `blacksmith-4vcpu-ubuntu-2404` (configurable, see [CI Runner Policy](#ci-runner-policy)) | `.deb` |
1111
| Windows | x64 | Self-hosted `[self-hosted, Windows, X64]` | `.exe` (NSIS) |
1212

1313
## Taskfile Commands
@@ -512,7 +512,7 @@ Runs on a self-hosted `[macOS, ARM64]` runner:
512512

513513
### `build-linux-amd64` — Linux amd64
514514

515-
Runs on `ubuntu-latest`:
515+
Runs on a configurable Blacksmith runner (default: `blacksmith-4vcpu-ubuntu-2404`, selectable via `linux-runner` workflow input):
516516

517517
1. Sets up the Tauri build environment via the shared composite action
518518
2. Builds with `tauri-action` targeting `x86_64-unknown-linux-gnu --bundles deb`

0 commit comments

Comments
 (0)