Skip to content

Commit f59a715

Browse files
committed
fix: switch macOS CI runners to macos-15
macos-14 runner image update (20260317.0174) broke CGo/systray builds due to CommandLineTools SDK incompatibility. Switch to macos-15 which has a working default Xcode/SDK configuration.
1 parent 9382930 commit f59a715

2 files changed

Lines changed: 3 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: go build -o onwatch .
4242

4343
menubar-macos:
44-
runs-on: macos-latest
44+
runs-on: macos-15
4545
name: Menubar macOS
4646

4747
steps:
@@ -52,11 +52,6 @@ jobs:
5252
with:
5353
go-version-file: go.mod
5454

55-
- name: Select Xcode and SDK
56-
run: |
57-
sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
58-
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> "$GITHUB_ENV"
59-
6055
- name: Compile tagged menubar packages
6156
run: |
6257
go test -tags menubar ./internal/menubar ./internal/web

.github/workflows/release.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383

8484
build-macos-amd64:
8585
needs: test
86-
runs-on: macos-14
86+
runs-on: macos-15
8787
name: Build macOS amd64
8888

8989
steps:
@@ -100,11 +100,6 @@ jobs:
100100
id: version
101101
run: echo "version=$(cat VERSION)" >> "$GITHUB_OUTPUT"
102102

103-
- name: Select Xcode and SDK
104-
run: |
105-
sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
106-
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> "$GITHUB_ENV"
107-
108103
- name: Build macOS artifact
109104
run: |
110105
CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build \
@@ -120,7 +115,7 @@ jobs:
120115

121116
build-macos-arm64:
122117
needs: test
123-
runs-on: macos-14
118+
runs-on: macos-15
124119
name: Build macOS arm64
125120

126121
steps:
@@ -137,11 +132,6 @@ jobs:
137132
id: version
138133
run: echo "version=$(cat VERSION)" >> "$GITHUB_OUTPUT"
139134

140-
- name: Select Xcode and SDK
141-
run: |
142-
sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
143-
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> "$GITHUB_ENV"
144-
145135
- name: Build macOS artifact
146136
run: |
147137
CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build \

0 commit comments

Comments
 (0)