Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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** ๋  ๋•Œ ํŠธ๋ฆฌ๊ฑฐ๋œ๋‹ค.

### ์„œ๋ช… ์ธ์ฆ์„œ
Expand Down