Skip to content

Commit a21698e

Browse files
leogdionclaude
andcommitted
Address PR review comments: update CI matrix and CodeQL workflow
- Ubuntu matrix: add Swift 6.2 and 6.3, remove nightly versions; use 6.3 as single-version for feature branches - build-macos: keep SPM-only; move macOS Build to build-macos-full - build-macos-full: add macOS Build with Xcode 26.4; update iOS/watchOS/tvOS/visionOS to Xcode 26.4 / osVersion 26.4 - Add build-android and build-wasm jobs (full-matrix only) - Update lint and docs needs to include new jobs - codeql.yml: update runner to macos-26, Xcode to 26.4 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent ba9a5c5 commit a21698e

File tree

2 files changed

+41
-19
lines changed

2 files changed

+41
-19
lines changed

.github/workflows/SyntaxKit.yml

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
run: |
3636
if [[ "${{ github.ref }}" == "refs/heads/main" || "${{ github.event_name }}" == "pull_request" ]]; then
3737
echo "full-matrix=true" >> "$GITHUB_OUTPUT"
38-
echo 'ubuntu-matrix={"os":["noble","jammy"],"swift":[{"version":"6.0"},{"version":"6.1"},{"version":"6.1","nightly":true},{"version":"6.2","nightly":true}]}' >> "$GITHUB_OUTPUT"
38+
echo 'ubuntu-matrix={"os":["noble","jammy"],"swift":[{"version":"6.0"},{"version":"6.1"},{"version":"6.2"},{"version":"6.3"}]}' >> "$GITHUB_OUTPUT"
3939
else
4040
echo "full-matrix=false" >> "$GITHUB_OUTPUT"
41-
echo 'ubuntu-matrix={"os":["noble"],"swift":[{"version":"6.1"}]}' >> "$GITHUB_OUTPUT"
41+
echo 'ubuntu-matrix={"os":["noble"],"swift":[{"version":"6.3"}]}' >> "$GITHUB_OUTPUT"
4242
fi
4343
4444
build-ubuntu:
@@ -108,11 +108,6 @@ jobs:
108108
- runs-on: macos-15
109109
xcode: "/Applications/Xcode_26.0.app"
110110

111-
# macOS Build
112-
- type: macos
113-
runs-on: macos-15
114-
xcode: "/Applications/Xcode_26.0.app"
115-
116111
steps:
117112
- uses: actions/checkout@v6
118113

@@ -156,36 +151,41 @@ jobs:
156151
runs-on: macos-15
157152
xcode: "/Applications/Xcode_16.4.app"
158153

154+
# macOS Build
155+
- type: macos
156+
runs-on: macos-15
157+
xcode: "/Applications/Xcode_26.4.app"
158+
159159
# iOS Build Matrix
160160
- type: ios
161161
runs-on: macos-15
162-
xcode: "/Applications/Xcode_26.0.app"
162+
xcode: "/Applications/Xcode_26.4.app"
163163
deviceName: "iPhone 17 Pro"
164-
osVersion: "26.0"
164+
osVersion: "26.4"
165165
download-platform: true
166166

167167
# watchOS Build Matrix
168168
- type: watchos
169169
runs-on: macos-15
170-
xcode: "/Applications/Xcode_26.0.app"
170+
xcode: "/Applications/Xcode_26.4.app"
171171
deviceName: "Apple Watch Ultra 3 (49mm)"
172-
osVersion: "26.0"
172+
osVersion: "26.4"
173173
download-platform: true
174174

175175
# tvOS Build Matrix
176176
- type: tvos
177177
runs-on: macos-15
178-
xcode: "/Applications/Xcode_26.0.app"
178+
xcode: "/Applications/Xcode_26.4.app"
179179
deviceName: "Apple TV"
180-
osVersion: "26.0"
180+
osVersion: "26.4"
181181
download-platform: true
182182

183183
# visionOS Build Matrix
184184
- type: visionos
185185
runs-on: macos-15
186-
xcode: "/Applications/Xcode_26.0.app"
186+
xcode: "/Applications/Xcode_26.4.app"
187187
deviceName: "Apple Vision Pro"
188-
osVersion: "26.0"
188+
osVersion: "26.4"
189189
download-platform: true
190190

191191
steps:
@@ -211,11 +211,33 @@ jobs:
211211
token: ${{ secrets.CODECOV_TOKEN }}
212212
flags: ${{ matrix.type && format('{0}{1}', matrix.type, matrix.osVersion) || 'spm' }}
213213

214+
build-android:
215+
name: Build for Android
216+
needs: [configure]
217+
if: needs.configure.outputs.full-matrix == 'true'
218+
runs-on: ubuntu-latest
219+
steps:
220+
- uses: actions/checkout@v6
221+
- uses: brightdigit/swift-build@v1.5.2
222+
with:
223+
type: android
224+
225+
build-wasm:
226+
name: Build for WASM
227+
needs: [configure]
228+
if: needs.configure.outputs.full-matrix == 'true'
229+
runs-on: ubuntu-latest
230+
steps:
231+
- uses: actions/checkout@v6
232+
- uses: brightdigit/swift-build@v1.5.2
233+
with:
234+
type: wasm
235+
214236
lint:
215237
name: Linting
216238
if: ${{ !cancelled() && !failure() && !contains(github.event.head_commit.message, 'ci skip') }}
217239
runs-on: ubuntu-latest
218-
needs: [build-ubuntu, build-macos, build-windows, build-macos-full]
240+
needs: [build-ubuntu, build-macos, build-windows, build-macos-full, build-android, build-wasm]
219241
env:
220242
MINT_PATH: .mint/lib
221243
MINT_LINK_PATH: .mint/bin
@@ -245,7 +267,7 @@ jobs:
245267
docs:
246268
name: Documentation Validation
247269
if: ${{ !cancelled() && !failure() && !contains(github.event.head_commit.message, 'ci skip') }}
248-
needs: [build-ubuntu, build-macos, build-windows, build-macos-full]
270+
needs: [build-ubuntu, build-macos, build-windows, build-macos-full, build-android, build-wasm]
249271
runs-on: ubuntu-latest
250272
steps:
251273
- uses: actions/checkout@v6

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# - https://gh.io/supported-runners-and-hardware-resources
3030
# - https://gh.io/using-larger-runners
3131
# Consider using larger runners for possible analysis time improvements.
32-
runs-on: ${{ (matrix.language == 'swift' && 'macos-15') || 'ubuntu-latest' }}
32+
runs-on: ${{ (matrix.language == 'swift' && 'macos-26') || 'ubuntu-latest' }}
3333
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
3434
permissions:
3535
actions: read
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/checkout@v6
5151

5252
- name: Setup Xcode
53-
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
53+
run: sudo xcode-select -s /Applications/Xcode_26.4.app/Contents/Developer
5454

5555
- name: Verify Swift Version
5656
run: |

0 commit comments

Comments
 (0)