Skip to content

Commit ce34058

Browse files
authored
Merge pull request #290 from ashfurrow/fix/ci
chore(ci): update CI environment
2 parents 4732063 + 4fb73d1 commit ce34058

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/workflows/build-and-test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ on: [push, pull_request]
44
jobs:
55
test:
66
name: Build and Test Nimble-Snapshots
7-
runs-on: macOS-13
7+
runs-on: macOS-15
88
steps:
99
- name: Checkout repository
10-
uses: actions/checkout@v4.2.2
10+
uses: actions/checkout@v6
1111

1212
- name: Setup Xcode version
13-
uses: maxim-lobanov/setup-xcode@v1.4.0
13+
uses: maxim-lobanov/setup-xcode@v1.6.0
1414
with:
15-
xcode-version: 14.3.1
15+
xcode-version: 26.1.1
1616

1717
- name: Set up Ruby 3.3.0
1818
uses: ruby/setup-ruby@v1.245.0
@@ -24,7 +24,7 @@ jobs:
2424
run: mkdir output
2525

2626
- name: Run tests in Swift 5.X
27-
run: xcodebuild -workspace 'Bootstrap/Bootstrap.xcworkspace' -sdk 'iphonesimulator' -scheme 'Bootstrap' -destination 'name=iPhone 8' SWIFT_VERSION=5.0 build test | tee output/xcodebuild_swift5.0.log
27+
run: xcodebuild -workspace 'Bootstrap/Bootstrap.xcworkspace' -sdk 'iphonesimulator' -scheme 'Bootstrap' -destination 'name=iPhone SE (3rd generation)' SWIFT_VERSION=5.0 build test | tee output/xcodebuild_swift5.0.log
2828

2929
- name: Run Carthage integration test
3030
run: carthage bootstrap --use-xcframeworks --platform iOS,tvOS && xcodebuild
@@ -35,28 +35,28 @@ jobs:
3535
swiftlint lint --no-cache --reporter junit | tee result.xml
3636
3737
- name: Store Swiftlint artifacts
38-
uses: actions/upload-artifact@v4
38+
uses: actions/upload-artifact@v6
3939
with:
4040
name: Swiftlint
4141
path: |
4242
result.xml
4343
4444
- name: Store output artifacts
45-
uses: actions/upload-artifact@v4
45+
uses: actions/upload-artifact@v6
4646
with:
4747
name: Output
4848
path: |
4949
output
5050
5151
- name: Store FailureDiffs artifacts
52-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@v6
5353
with:
5454
name: FailureDiffs
5555
path: |
5656
Bootstrap/BootstrapTests/FailureDiffs/
5757
5858
- name: Danger action
59-
uses: MeilCli/danger-action@v5.6.33
59+
uses: MeilCli/danger-action@v6
6060
if: github.event_name == 'pull_request'
6161
with:
6262
plugins_file: 'Gemfile'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ build
2020

2121
# Swift Package Manager
2222
.swiftpm
23+
.build
2324

2425
.DS_Store

Bootstrap/Bootstrap/AppDelegate.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2121
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
2222

2323
// There are device specific tests, so we need to be tight on the devices running tests
24-
2524
let version = ProcessInfo.processInfo.operatingSystemVersion
26-
let minVersion = OperatingSystemVersion(majorVersion: 10, minorVersion: 3, patchVersion: 0)
25+
let minVersion = OperatingSystemVersion(majorVersion: 13, minorVersion: 0, patchVersion: 0)
2726
assert(ProcessInfo.processInfo.isOperatingSystemAtLeast(minVersion),
28-
"The tests should be run at least on iOS 10.0, not \(version.majorVersion), \(version.minorVersion)")
27+
"The tests should be run at least on iOS 13.0, not \(version.majorVersion), \(version.minorVersion)")
2928

3029
#if swift(>=4.2)
3130
let stringFromSize: (CGSize) -> String = { NSCoder.string(for: $0) }
@@ -34,7 +33,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3433
#endif
3534
let nativeResolution = UIScreen.main.nativeBounds.size
3635
assert(isExpectedDevice(nativeResolution: nativeResolution),
37-
"The tests should be run on an iPhone 8, not a device with " +
36+
"The tests should be run on an iPhone SE (3rd generation), not a device with " +
3837
"native resolution \(stringFromSize(nativeResolution))")
3938

4039
return true

0 commit comments

Comments
 (0)