Skip to content

Commit e90340b

Browse files
ci: switch to macOS 26 runners, remove workarounds
- Upgrade runs-on from macos-15 to macos-26 (both workflows) - Remove MACOSX_DEPLOYMENT_TARGET override hack (no longer needed) - Remove AppIcon.icns fallback step and file (Xcode 26 compiles .icon) - Pin actions/checkout and actions/upload-artifact SHAs in release workflow Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 354fe39 commit e90340b

3 files changed

Lines changed: 7 additions & 22 deletions

File tree

.github/workflows/build_release.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ env:
2020
jobs:
2121
test:
2222
name: Run Tests
23-
runs-on: macos-15
23+
runs-on: macos-26
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2727

2828
- name: Create Config.xcconfig
2929
run: |
@@ -34,11 +34,9 @@ jobs:
3434
3535
- name: Run Tests
3636
run: |
37-
RUNNER_OS_VERSION=$(sw_vers -productVersion | cut -d. -f1)
3837
xcodebuild -project "$PROJECT" -scheme "$SCHEME" \
3938
-destination 'platform=macOS' \
4039
ARCHS="arm64" \
41-
MACOSX_DEPLOYMENT_TARGET="$RUNNER_OS_VERSION.0" \
4240
-configuration Debug test \
4341
CODE_SIGN_IDENTITY="-" \
4442
CODE_SIGNING_REQUIRED=NO \
@@ -47,19 +45,19 @@ jobs:
4745
4846
- name: Upload Test Results
4947
if: always()
50-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
5149
with:
5250
name: ReleaseTestResults
5351
path: ReleaseTestResults.xcresult
5452

5553
build-and-release:
5654
needs: test
57-
runs-on: macos-15
55+
runs-on: macos-26
5856
permissions:
5957
contents: write
6058
steps:
6159
- name: Checkout
62-
uses: actions/checkout@v4
60+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
6361

6462
- name: Create Config.xcconfig
6563
run: |
@@ -127,17 +125,6 @@ jobs:
127125
echo "path=$APP_PATH" >> "$GITHUB_OUTPUT"
128126
echo "App: $APP_PATH"
129127
130-
- name: Ensure AppIcon.icns exists
131-
env:
132-
APP_PATH: ${{ steps.app.outputs.path }}
133-
run: |
134-
RESOURCES="$APP_PATH/Contents/Resources"
135-
if [ ! -f "$RESOURCES/AppIcon.icns" ]; then
136-
echo "AppIcon.icns missing — injecting pre-built fallback"
137-
cp apps/native/wolfwave/Resources/AppIcon.icns "$RESOURCES/AppIcon.icns"
138-
fi
139-
echo "AppIcon: $(ls -la "$RESOURCES/AppIcon.icns")"
140-
141128
- name: Code sign app bundle
142129
env:
143130
APP_PATH: ${{ steps.app.outputs.path }}
@@ -244,7 +231,7 @@ jobs:
244231
echo "Appcast generated"
245232
246233
- name: Upload DMG artifact
247-
uses: actions/upload-artifact@v4
234+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
248235
with:
249236
name: ${{ steps.version.outputs.dmg_name }}
250237
path: builds/${{ steps.version.outputs.dmg_name }}

.github/workflows/test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
jobs:
1818
test:
1919
name: Build & Test
20-
runs-on: macos-15
20+
runs-on: macos-26
2121
steps:
2222
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2323

@@ -28,11 +28,9 @@ jobs:
2828
2929
- name: Build & Test
3030
run: |
31-
RUNNER_OS_VERSION=$(sw_vers -productVersion | cut -d. -f1)
3231
xcodebuild -project "$PROJECT" -scheme "$SCHEME" \
3332
-destination 'platform=macOS' \
3433
ARCHS="arm64" \
35-
MACOSX_DEPLOYMENT_TARGET="$RUNNER_OS_VERSION.0" \
3634
-configuration Debug test \
3735
CODE_SIGN_IDENTITY="-" \
3836
CODE_SIGNING_REQUIRED=NO \
-37.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)