Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI actions #1184

Merged
merged 3 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/carthage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
carthage:
name: Carthage Build
runs-on: macos-12
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/ci-swiftpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ on:
- "*"

jobs:
swiftpm_darwin_monterey:
swiftpm_darwin_ventura:
name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
runs-on: macos-12
runs-on: macos-13
strategy:
matrix:
xcode: ["14.0.1", "14.1", "14.2"]
xcode: ["14.3.1"]
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
steps:
- uses: actions/checkout@v4
- run: ./test swiftpm

swiftpm_darwin_ventura:
swiftpm_darwin_sonoma:
name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
runs-on: macos-13
runs-on: macos-14
strategy:
matrix:
xcode: ["14.3.1"]
xcode: ["15.3", "16.1"]
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
steps:
Expand All @@ -43,6 +43,8 @@ jobs:
container:
- swift:5.7
- swift:5.8
- swift:5.9
- swift:6.0
# - swiftlang/swift:nightly
fail-fast: false
container: ${{ matrix.container }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci-xcode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ on:
- "*"

jobs:
xcode_monterey:
xcode_ventura:
name: Xcode ${{ matrix.xcode }} (Xcode Project)
runs-on: macos-12
runs-on: macos-13
strategy:
matrix:
xcode: ["14.0.1", "14.1", "14.2"]
xcode: ["14.3.1"]
fail-fast: false
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
Expand All @@ -27,12 +27,12 @@ jobs:
- run: ./test tvos
- run: ./test watchos

xcode_ventura:
xcode_sonoma:
name: Xcode ${{ matrix.xcode }} (Xcode Project)
runs-on: macos-13
runs-on: macos-14
strategy:
matrix:
xcode: ["14.3.1"]
xcode: ["15.4", "16.1"]
fail-fast: false
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
Expand All @@ -45,10 +45,10 @@ jobs:

xcode_spm:
name: Xcode ${{ matrix.xcode }} (Swift Package)
runs-on: macos-12
runs-on: macos-14
strategy:
matrix:
xcode: ["14.0.1"]
xcode: ["16.1"]
fail-fast: false
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cocoapods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
cocoapods:
name: CocoaPods Lint
runs-on: macos-12
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ permissions:
jobs:
build-documentation:
runs-on: ubuntu-latest
container: swift:latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
jobs:
carthage_archive:
name: Darwin, Xcode 14.0
runs-on: macos-12
runs-on: macos-14
strategy:
matrix:
xcode: ["14.0.1"]
xcode: ["16.1"]
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
steps:
Expand Down
3 changes: 3 additions & 0 deletions Tests/NimbleTests/SwiftTestingSupportTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import XCTest
}
}

#if canImport(Darwin)
// the open source version of XCTest doesn't include `XCTExpectFailure`.
class MixedSwiftTestingXCTestSupport: XCTestCase {
func testAlsoRecordsErrorsToXCTest() {
XCTExpectFailure("This should fail")
Expand All @@ -29,5 +31,6 @@ class MixedSwiftTestingXCTestSupport: XCTestCase {
try require(false).to(beTrue())
}
}
#endif

#endif
Loading