diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5c9bd3..7bb6f97 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -113,7 +113,8 @@ jobs: # - 1 "global" task that builds universal installers # - N "local" tasks that build each platform's binaries and platform-specific installers matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }} - runs-on: ${{ matrix.runner }} + # Existing signed tags can still contain cargo-dist's retired runner default. + runs-on: ${{ matrix.runner == 'macos-14' && 'macos-15' || matrix.runner }} timeout-minutes: 60 container: ${{ matrix.container && matrix.container.image || null }} env: diff --git a/dist-workspace.toml b/dist-workspace.toml index 616b887..5bd55dd 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -26,3 +26,6 @@ hosting = "github" github-attestations = true # Whether to install an updater program install-updater = false + +[dist.github-custom-runners] +aarch64-apple-darwin = "macos-15" diff --git a/docs/specs/spec-process-cicd-release-publication.md b/docs/specs/spec-process-cicd-release-publication.md index 546bc10..8ccbeb5 100644 --- a/docs/specs/spec-process-cicd-release-publication.md +++ b/docs/specs/spec-process-cicd-release-publication.md @@ -1,8 +1,8 @@ --- title: CI/CD Workflow Specification - Manual Release Publication -version: 1.2 +version: 1.3 date_created: 2026-07-18 -last_updated: 2026-07-18 +last_updated: 2026-10-31 owner: Zed Workspace Dock maintainers tags: [process, cicd, github-actions, release, cargo-dist, approval] --- @@ -80,6 +80,7 @@ graph TD - Publication dispatches for the same tag are queued; a second run never overlaps the first. - Runners require network access for tool installation, dependencies, artifact storage, and release upload. +- Apple Silicon builds use `macos-15`. The workflow maps `macos-14` entries from older tagged cargo-dist configurations to `macos-15`, preserving the selected source tag while avoiding the retired runner image. - The release approval must be granted before any distribution planning or building for a manual dispatch. ## Error Handling Strategy @@ -124,6 +125,7 @@ graph TD | Version | Date | Changes | |---|---|---| +| 1.3 | 2026-10-31 | Use macos-15 for Apple Silicon, including plans generated from older signed tags. | | 1.2 | 2026-07-18 | Renamed the approval environment to release-publication. | | 1.1 | 2026-07-18 | Added per-tag queued publication and dedicated validation responsibility. | | 1.0 | 2026-07-18 | Initial specification. |