Skip to content

Commit ba8e153

Browse files
committed
Fix CI
1 parent f26d5bc commit ba8e153

File tree

8 files changed

+100
-35
lines changed

8 files changed

+100
-35
lines changed

.github/workflows/checks.yml

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
action: ${{ matrix.action }}
178178

179179
configurations:
180-
runs-on: macos-latest
180+
runs-on: macos-12
181181
needs: [verify-dist]
182182
strategy:
183183
matrix:
@@ -211,39 +211,36 @@ jobs:
211211
working-directory: fixtures/debug
212212

213213
swift:
214-
name: swift ${{ matrix.swift }}
215-
runs-on: ${{ matrix.os }}
214+
name: swift ${{ matrix.x.swift }}
215+
runs-on: ${{ matrix.x.os }}
216216
needs: [verify-dist]
217217
strategy:
218218
matrix:
219-
swift:
220-
- ~5.0
221-
- ~5.1
222-
- ~5.2
223-
- ~5.3
224-
os:
225-
- macos-10.15
226-
include:
227-
- swift: ~5.4
228-
os: macos-11
219+
x:
229220
- swift: ~5.5
230-
os: macos-11
221+
os: macos-12
231222
- swift: ~5.6
232223
os: macos-12
224+
- swift: ~5.7
225+
os: macos-13
226+
- swift: ~5.8
227+
os: macos-14
228+
- swift: ~5.9
229+
os: macos-14
233230
steps:
234231
- uses: actions/checkout@v4
235232
- uses: ./
236233
with:
237-
swift: ${{ matrix.swift }}
238-
working-directory: fixtures/swift/${{ matrix.swift }}
234+
swift: ${{ matrix.x.swift }}
235+
working-directory: fixtures/swift/${{ matrix.x.swift }}
239236
action: build
240237
- uses: mxcl/get-swift-version@v2
241238
with:
242-
requires: ${{ matrix.swift }}
239+
requires: ${{ matrix.x.swift }}
243240

244241
xcode:
245242
name: ${{ matrix.platform }} (${{ matrix.action }}, ${{ matrix.xcode }}${{ matrix.codecov && ', cc' || ''}})
246-
runs-on: ${{ matrix.os || 'macos-11' }}
243+
runs-on: ${{ matrix.os || 'macos-12' }}
247244
needs: [verify-dist]
248245
strategy:
249246
matrix:
@@ -253,27 +250,22 @@ jobs:
253250
- macOS
254251
- watchOS
255252
xcode:
256-
- ^10
257-
- ^11
258-
- ^12
259253
- ^13
254+
- ^14
260255
codecov:
261256
- false
262257
action:
263258
- test
264259
warnings-as-errors:
265260
- false
266261
include:
267-
- xcode: ^10
268-
os: macos-10.15
269-
- xcode: ^13
270-
os: macos-12
271262
- platform: mac-catalyst
272263
xcode: ^13
273264
codecov: false
274265
action: test
275266
warnings-as-errors: false
276267
- platform: visionOS
268+
os: macos-14
277269
xcode: ^15
278270
codecov: false
279271
action: test
@@ -299,12 +291,11 @@ jobs:
299291
strategy:
300292
matrix:
301293
os:
302-
- macos-10.15
303-
- macos-11
294+
- macos-12
304295
platform:
305296
- watchOS
306297
xcode:
307-
- ^12
298+
- ^13
308299
codecov:
309300
- false
310301
action:
@@ -325,7 +316,7 @@ jobs:
325316

326317
verify-codecov:
327318
name: ${{ matrix.platform }} (${{ matrix.action }}${{ matrix.codecov && ', cc' || ''}}${{ matrix.warnings-as-errors && ', warnings-as-errors' || ''}})
328-
runs-on: macos-latest
319+
runs-on: macos-12
329320
needs: [verify-dist]
330321
strategy:
331322
matrix:
@@ -345,24 +336,23 @@ jobs:
345336
- uses: ./
346337
with:
347338
platform: ${{ matrix.platform }}
348-
xcode: ${{ matrix.xcode }}
349339
working-directory: fixtures/${{ matrix.platform }}
350340
code-coverage: ${{ matrix.codecov }}
351341
action: ${{ matrix.action }}
352342
warnings-as-errors: ${{ matrix.warnings-as-errors }}
353343

354-
verify-swift-version:
344+
verify-dot-swift-version:
355345
name: .swift-version
356-
runs-on: macos-10.15
346+
runs-on: macos-14
357347
needs: [verify-dist]
358348
steps:
359349
- uses: actions/checkout@v4
360350
- uses: mxcl/get-swift-version@v2
361351
with:
362-
requires: '>5.1'
352+
requires: '>5.8'
363353
- uses: ./
364354
with:
365355
working-directory: fixtures/dot-swift-version
366356
- uses: mxcl/get-swift-version@v2
367357
with:
368-
requires: ~5.1
358+
requires: ~5.9
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1
1+
5.9

fixtures/swift/~5.7/Package.swift

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// swift-tools-version:5.0
2+
3+
import PackageDescription
4+
5+
let name = "my-fixture"
6+
7+
let pkg = Package(
8+
name: name,
9+
products: [
10+
.library(name: name, targets: [name]),
11+
],
12+
targets: [
13+
.target(name: name, path: ".", sources: ["code.swift"]),
14+
]
15+
)
16+
17+
pkg.platforms = [
18+
.macOS(.v10_10),
19+
.iOS(.v9),
20+
.tvOS(.v9),
21+
.watchOS(.v3)
22+
]

fixtures/swift/~5.7/code.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#if swift(>=5.8) || swift(<5.7)
2+
#error("Swift version seems to be wrong")
3+
#endif

fixtures/swift/~5.8/Package.swift

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// swift-tools-version:5.0
2+
3+
import PackageDescription
4+
5+
let name = "my-fixture"
6+
7+
let pkg = Package(
8+
name: name,
9+
products: [
10+
.library(name: name, targets: [name]),
11+
],
12+
targets: [
13+
.target(name: name, path: ".", sources: ["code.swift"]),
14+
]
15+
)
16+
17+
pkg.platforms = [
18+
.macOS(.v10_10),
19+
.iOS(.v9),
20+
.tvOS(.v9),
21+
.watchOS(.v3)
22+
]

fixtures/swift/~5.8/code.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#if swift(>=5.9) || swift(<5.8)
2+
#error("Swift version seems to be wrong")
3+
#endif

fixtures/swift/~5.9/Package.swift

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// swift-tools-version:5.0
2+
3+
import PackageDescription
4+
5+
let name = "my-fixture"
6+
7+
let pkg = Package(
8+
name: name,
9+
products: [
10+
.library(name: name, targets: [name]),
11+
],
12+
targets: [
13+
.target(name: name, path: ".", sources: ["code.swift"]),
14+
]
15+
)
16+
17+
pkg.platforms = [
18+
.macOS(.v10_10),
19+
.iOS(.v9),
20+
.tvOS(.v9),
21+
.watchOS(.v3)
22+
]

fixtures/swift/~5.9/code.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#if swift(>=5.10) || swift(<5.9)
2+
#error("Swift version seems to be wrong")
3+
#endif

0 commit comments

Comments
 (0)