Skip to content

Commit 23903e1

Browse files
authored
Update CI actions (#1184)
* Bump CI actions Github retired macos 12 runners, so upgrade to more recent versions * Exclude the MixedSwiftTestingXCTestSupport test from building on non-darwin platforms * Specify the container to build documentation on
1 parent 7795df4 commit 23903e1

File tree

7 files changed

+24
-18
lines changed

7 files changed

+24
-18
lines changed

.github/workflows/carthage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
carthage:
1515
name: Carthage Build
16-
runs-on: macos-12
16+
runs-on: macos-14
1717
steps:
1818
- uses: actions/checkout@v4
1919
- uses: ruby/setup-ruby@v1

.github/workflows/ci-swiftpm.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ on:
1111
- "*"
1212

1313
jobs:
14-
swiftpm_darwin_monterey:
14+
swiftpm_darwin_ventura:
1515
name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
16-
runs-on: macos-12
16+
runs-on: macos-13
1717
strategy:
1818
matrix:
19-
xcode: ["14.0.1", "14.1", "14.2"]
19+
xcode: ["14.3.1"]
2020
env:
2121
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
2222
steps:
2323
- uses: actions/checkout@v4
2424
- run: ./test swiftpm
2525

26-
swiftpm_darwin_ventura:
26+
swiftpm_darwin_sonoma:
2727
name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
28-
runs-on: macos-13
28+
runs-on: macos-14
2929
strategy:
3030
matrix:
31-
xcode: ["14.3.1"]
31+
xcode: ["15.3", "16.1"]
3232
env:
3333
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
3434
steps:
@@ -43,6 +43,8 @@ jobs:
4343
container:
4444
- swift:5.7
4545
- swift:5.8
46+
- swift:5.9
47+
- swift:6.0
4648
# - swiftlang/swift:nightly
4749
fail-fast: false
4850
container: ${{ matrix.container }}

.github/workflows/ci-xcode.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ on:
1111
- "*"
1212

1313
jobs:
14-
xcode_monterey:
14+
xcode_ventura:
1515
name: Xcode ${{ matrix.xcode }} (Xcode Project)
16-
runs-on: macos-12
16+
runs-on: macos-13
1717
strategy:
1818
matrix:
19-
xcode: ["14.0.1", "14.1", "14.2"]
19+
xcode: ["14.3.1"]
2020
fail-fast: false
2121
env:
2222
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
@@ -27,12 +27,12 @@ jobs:
2727
- run: ./test tvos
2828
- run: ./test watchos
2929

30-
xcode_ventura:
30+
xcode_sonoma:
3131
name: Xcode ${{ matrix.xcode }} (Xcode Project)
32-
runs-on: macos-13
32+
runs-on: macos-14
3333
strategy:
3434
matrix:
35-
xcode: ["14.3.1"]
35+
xcode: ["15.4", "16.1"]
3636
fail-fast: false
3737
env:
3838
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
@@ -45,10 +45,10 @@ jobs:
4545

4646
xcode_spm:
4747
name: Xcode ${{ matrix.xcode }} (Swift Package)
48-
runs-on: macos-12
48+
runs-on: macos-14
4949
strategy:
5050
matrix:
51-
xcode: ["14.0.1"]
51+
xcode: ["16.1"]
5252
fail-fast: false
5353
env:
5454
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"

.github/workflows/cocoapods.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
cocoapods:
1515
name: CocoaPods Lint
16-
runs-on: macos-12
16+
runs-on: macos-14
1717
steps:
1818
- uses: actions/checkout@v4
1919
- uses: ruby/setup-ruby@v1

.github/workflows/documentation.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ permissions:
1515
jobs:
1616
build-documentation:
1717
runs-on: ubuntu-latest
18+
container: swift:latest
1819
steps:
1920
- name: Checkout
2021
uses: actions/checkout@v4

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77
jobs:
88
carthage_archive:
99
name: Darwin, Xcode 14.0
10-
runs-on: macos-12
10+
runs-on: macos-14
1111
strategy:
1212
matrix:
13-
xcode: ["14.0.1"]
13+
xcode: ["16.1"]
1414
env:
1515
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
1616
steps:

Tests/NimbleTests/SwiftTestingSupportTest.swift

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import XCTest
1717
}
1818
}
1919

20+
#if canImport(Darwin)
21+
// the open source version of XCTest doesn't include `XCTExpectFailure`.
2022
class MixedSwiftTestingXCTestSupport: XCTestCase {
2123
func testAlsoRecordsErrorsToXCTest() {
2224
XCTExpectFailure("This should fail")
@@ -29,5 +31,6 @@ class MixedSwiftTestingXCTestSupport: XCTestCase {
2931
try require(false).to(beTrue())
3032
}
3133
}
34+
#endif
3235

3336
#endif

0 commit comments

Comments
 (0)