Skip to content

Commit 2d983f6

Browse files
committed
updating github workflow
1 parent 7604f3d commit 2d983f6

File tree

1 file changed

+29
-13
lines changed

1 file changed

+29
-13
lines changed

.github/workflows/SyntaxKit.yml

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,20 @@ jobs:
99
build-ubuntu:
1010
name: Build on Ubuntu
1111
runs-on: ubuntu-latest
12-
container: swiftlang/swift:nightly-${{ matrix.swift-version }}-${{ matrix.os }}
12+
container: ${{ matrix.swift.nightly && format('swiftlang/swift:nightly-{0}-{1}', matrix.swift.version, matrix.os) || format('swift:{0}-{1}', matrix.swift.version, matrix.os) }}
1313
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
1414
strategy:
1515
matrix:
16-
os: ["noble", "jammy"]
17-
swift-version: ["6.1", "6.2"]
16+
os: [noble, jammy]
17+
swift:
18+
- version: "6.1"
19+
- version: "6.1"
20+
nightly: true
21+
- version: "6.2"
22+
nightly: true
1823
steps:
1924
- uses: actions/checkout@v4
20-
- uses: brightdigit/swift-build@v1.1.1
25+
- uses: brightdigit/swift-build@v1.2.1
2126
- uses: sersoft-gmbh/swift-coverage-action@v4
2227
id: coverage-files
2328
with:
@@ -41,47 +46,58 @@ jobs:
4146
matrix:
4247
include:
4348
# SPM Build Matrix
49+
- runs-on: macos-15
50+
xcode: "/Applications/Xcode_26.0.app"
51+
4452
- runs-on: macos-15
4553
xcode: "/Applications/Xcode_16.4.app"
4654

4755
# macOS Build Matrix
56+
- type: macos
57+
runs-on: macos-15
58+
xcode: "/Applications/Xcode_26.0.app"
59+
4860
- type: macos
4961
runs-on: macos-15
5062
xcode: "/Applications/Xcode_16.4.app"
63+
64+
- type: macos
65+
runs-on: macos-15
66+
xcode: "/Applications/Xcode_26.0.app"
5167

5268
# iOS Build Matrix
5369
- type: ios
5470
runs-on: macos-15
55-
xcode: "/Applications/Xcode_16.4.app"
71+
xcode: "/Applications/Xcode_26.0.app"
5672
deviceName: "iPhone 16 Pro"
57-
osVersion: "18.5"
73+
osVersion: "26.0"
5874

5975
# watchOS Build Matrix
6076
- type: watchos
6177
runs-on: macos-15
62-
xcode: "/Applications/Xcode_16.4.app"
78+
xcode: "/Applications/Xcode_26.0.app"
6379
deviceName: "Apple Watch Ultra 2 (49mm)"
64-
osVersion: "11.5"
80+
osVersion: "26.0"
6581

6682
# tvOS Build Matrix
6783
- type: tvos
6884
runs-on: macos-15
69-
xcode: "/Applications/Xcode_16.4.app"
85+
xcode: "/Applications/Xcode_26.0.app"
7086
deviceName: "Apple TV"
71-
osVersion: "18.5"
87+
osVersion: "26.0"
7288

7389
# visionOS Build Matrix
7490
- type: visionos
7591
runs-on: macos-15
76-
xcode: "/Applications/Xcode_16.4.app"
92+
xcode: "/Applications/Xcode_26.0.app"
7793
deviceName: "Apple Vision Pro"
78-
osVersion: "2.5"
94+
osVersion: "26.0"
7995

8096
steps:
8197
- uses: actions/checkout@v4
8298

8399
- name: Build and Test
84-
uses: brightdigit/swift-build@v1.1.1
100+
uses: brightdigit/swift-build@v1.2.1
85101
with:
86102
scheme: ${{ env.PACKAGE_NAME }}-Package
87103
type: ${{ matrix.type }}

0 commit comments

Comments
 (0)