From b25f1263f2a73c418e50f6758d73f597106b67f7 Mon Sep 17 00:00:00 2001 From: moreih29 Date: Fri, 20 Nov 2026 00:22:12 +0900 Subject: [PATCH] ci: skip macOS runners on PRs into develop The macOS jobs finish in about a minute but can wait up to eleven minutes for a runner, and twice this week were cancelled before one was assigned. PRs into develop are tested on a Mac before merging, so they now run Tests and Agent tests on Ubuntu and Windows only. PRs into main, pushes to main and manual runs keep all three operating systems, so the release PR still checks macOS on a clean runner. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 9 +++++++-- docs/RELEASING.md | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 648c13150..c7dc26782 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,11 @@ # release builds the renderer on each OS again. # Whenever node-pty, better-sqlite3 or Electron changes, each runner builds # the native modules against Electron on its own OS, proving they build there. +# +# macOS runs only for main: PRs into it, pushes to it and runs by hand. PRs +# into develop skip it, since they are tested on a Mac before merging and the +# macOS runners can queue for many minutes; the release PR into main still +# checks macOS on a clean runner. name: CI @@ -116,7 +121,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-15, ubuntu-latest, windows-latest] + os: ${{ fromJSON(github.base_ref == 'develop' && '["ubuntu-latest","windows-latest"]' || '["macos-15","ubuntu-latest","windows-latest"]') }} steps: - name: Checkout @@ -169,7 +174,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-15, ubuntu-latest, windows-latest] + os: ${{ fromJSON(github.base_ref == 'develop' && '["ubuntu-latest","windows-latest"]' || '["macos-15","ubuntu-latest","windows-latest"]') }} steps: - name: Checkout diff --git a/docs/RELEASING.md b/docs/RELEASING.md index 05f5d9606..61b50f5b0 100644 --- a/docs/RELEASING.md +++ b/docs/RELEASING.md @@ -12,7 +12,7 @@ | `develop` | 통합 브랜치. 모든 기능/수정이 여기 쌓인다. | | `main` | 릴리스 브랜치. 태그와 GitHub Release는 여기서만 만든다. | -- **CI (`ci.yml`)** 는 `main` · `develop` 으로의 **PR** 과 `main` **push** 에서 돈다 (typecheck · lint · test, electron-builder 미실행). macOS · Ubuntu · Windows 러너에서 각각 돌며, 세 OS 모두 통과해야 한다. develop push 에는 게이트가 없으므로, 품질 게이트는 PR 에서 통과시킨다. +- **CI (`ci.yml`)** 는 `main` · `develop` 으로의 **PR** 과 `main` **push** 에서 돈다 (typecheck · lint · test, electron-builder 미실행). `main` 으로의 PR · push 와 수동 실행은 macOS · Ubuntu · Windows 러너에서 각각 돌며, 세 OS 모두 통과해야 한다. `develop` 으로의 PR 은 Ubuntu · Windows 만 돈다 — macOS 러너는 대기가 길고, macOS 는 머지 전에 Mac 에서 로컬로 테스트한다. develop push 에는 게이트가 없으므로, 품질 게이트는 PR 에서 통과시킨다. - **Release (`release.yml`)** 는 **GitHub Release 가 created** 될 때 트리거된다. ### 서명 인증서