Skip to content

Commit 85ccc6a

Browse files
authored
Broaden CI matrix (#77)
* Branch out test setups * Use macOS 26 image * Run CI on push * Xcode 26
1 parent bb139e8 commit 85ccc6a

2 files changed

Lines changed: 35 additions & 13 deletions

File tree

.github/workflows/test.yml

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ on:
44
push:
55
branches: [ "main" ]
66
pull_request:
7-
types: [opened, reopened]
7+
types: [opened, reopened, synchronize]
88

99
jobs:
10-
test:
10+
test-16-2:
1111
runs-on: macos-latest
1212
steps:
1313
- name: Set Xcode version
@@ -16,12 +16,20 @@ jobs:
1616
- name: Run tests
1717
run: swift test -v
1818

19-
test-linux:
20-
if: false
21-
runs-on: ubuntu-22.04
19+
test-26:
20+
runs-on: macos-26
21+
steps:
22+
- name: Set Xcode version
23+
run: sudo xcode-select -s /Applications/Xcode_26.0.app
24+
- uses: actions/checkout@v3
25+
- name: Run tests
26+
run: swift test -v
27+
28+
test-linux-6-1:
29+
runs-on: ubuntu-latest
2230
steps:
2331
- uses: actions/checkout@v3
24-
- uses: swift-actions/setup-swift@v2
32+
- uses: SwiftyLab/setup-swift@latest
2533
with:
2634
swift-version: "6.1.0"
2735
- name: Get swift version
@@ -30,3 +38,17 @@ jobs:
3038
run: git config --global user.email "test@example.com" && git config --global user.name "Test User"
3139
- name: Run tests
3240
run: swift test -v
41+
42+
test-linux-6-2:
43+
runs-on: ubuntu-latest
44+
steps:
45+
- uses: actions/checkout@v3
46+
- uses: SwiftyLab/setup-swift@latest
47+
with:
48+
swift-version: "6.2.0"
49+
- name: Get swift version
50+
run: swift --version
51+
- name: Prepare Git
52+
run: git config --global user.email "test@example.com" && git config --global user.name "Test User"
53+
- name: Run tests
54+
run: swift test -v

Package.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ let targets: [PackageDescription.Target] = [
3333
"PathKit",
3434
"Yams",
3535
.product(name: "ArgumentParser", package: "swift-argument-parser")],
36-
swiftSettings: flags,
36+
swiftSettings: flags
3737
),
3838
.target(name: "DependencyCalculator",
3939
dependencies: ["Workspace", "PathKit", "Git", .product(name: "Logging", package: "swift-log")],
40-
swiftSettings: flags,
40+
swiftSettings: flags
4141
),
4242
.target(name: "TestConfigurator",
4343
dependencies: [
@@ -46,18 +46,18 @@ let targets: [PackageDescription.Target] = [
4646
.product(name: "Logging", package: "swift-log"),
4747
.product(name: "ArgumentParser", package: "swift-argument-parser")
4848
],
49-
swiftSettings: flags,
49+
swiftSettings: flags
5050
),
5151
.target(name: "Workspace",
5252
dependencies: ["XcodeProj", .product(name: "Logging", package: "swift-log")],
53-
swiftSettings: flags,
53+
swiftSettings: flags
5454
),
5555
.target(name: "Git",
5656
dependencies: ["SelectiveTestShell", "PathKit", .product(name: "Logging", package: "swift-log")],
57-
swiftSettings: flags,
57+
swiftSettings: flags
5858
),
5959
.target(name: "SelectiveTestShell",
60-
swiftSettings: flags,
60+
swiftSettings: flags
6161
),
6262
.testTarget(
6363
name: "SelectiveTestingTests",
@@ -83,7 +83,7 @@ let targets: [PackageDescription.Target] = [
8383
]
8484
),
8585
dependencies: ["xcode-selective-test"]
86-
),
86+
)
8787
]
8888

8989
let package = Package(

0 commit comments

Comments
 (0)