Skip to content

Commit f14b5eb

Browse files
authored
Merge pull request #270 from ishkawa/refactor-travis-yml
[CI] Refactor .travis.yml
2 parents 86d51ec + fb60af3 commit f14b5eb

3 files changed

Lines changed: 26 additions & 32 deletions

File tree

.travis.yml

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,42 @@ env:
44

55
matrix:
66
include:
7-
- os: osx
7+
- &podspec
8+
os: osx
89
language: objective-c
9-
osx_image: xcode9.2
10+
osx_image: xcode10.2
1011
script:
11-
- set -o pipefail
12-
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
13-
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
14-
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV" ENABLE_TESTABILITY=YES | xcpretty -c
15-
after_success:
16-
- bash <(curl -s https://codecov.io/bash)
17-
- os: osx
18-
language: objective-c
19-
osx_image: xcode9.4
20-
script:
21-
- set -o pipefail
22-
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
23-
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
24-
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV" ENABLE_TESTABILITY=YES | xcpretty -c
25-
after_success:
26-
- bash <(curl -s https://codecov.io/bash)
27-
- os: osx
12+
- pod lib lint --allow-warnings
13+
- &xcode
14+
os: osx
2815
language: objective-c
29-
osx_image: xcode10
16+
osx_image: xcode9.2
3017
script:
3118
- set -o pipefail
3219
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
3320
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
3421
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV" ENABLE_TESTABILITY=YES | xcpretty -c
3522
after_success:
3623
- bash <(curl -s https://codecov.io/bash)
37-
- os: osx
24+
- <<: *xcode
25+
osx_image: xcode9.4
26+
- <<: *xcode
27+
osx_image: xcode10.1
28+
- <<: *xcode
29+
osx_image: xcode10.2
30+
- &swiftpm
31+
os: osx
3832
language: generic
3933
osx_image: xcode9.2
4034
script:
4135
- swift build
4236
- swift test
43-
- os: osx
44-
language: generic
37+
- <<: *swiftpm
4538
osx_image: xcode9.4
46-
script:
47-
- swift build
48-
- swift test
49-
- os: osx
50-
language: generic
51-
osx_image: xcode10
52-
script:
53-
- swift build
54-
- swift test
39+
- <<: *swiftpm
40+
osx_image: xcode10.1
41+
- <<: *swiftpm
42+
osx_image: xcode10.2
5543

5644
notifications:
5745
email: false

Tests/APIKitTests/BodyParametersType/ProtobufBodyParametersTests.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import APIKit
44

55
class ProtobufBodyParametersTests: XCTestCase {
66
func testProtobufSuccess() {
7+
// Temporarily gated due to https://openradar.appspot.com/49262697
8+
if #available(macOS 10.11, *) {
79
let object = NSKeyedArchiver.archivedData(withRootObject: ["foo": 1, "bar": 2, "baz": 3])
810
let parameters = ProtobufBodyParameters(protobufObject: object)
911
XCTAssertEqual(parameters.contentType, "application/protobuf")
@@ -21,5 +23,6 @@ class ProtobufBodyParametersTests: XCTestCase {
2123
} catch {
2224
XCTFail()
2325
}
26+
}
2427
}
2528
}

Tests/APIKitTests/DataParserType/ProtobufDataParserTests.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ class ProtobufDataParserTests: XCTestCase {
99
}
1010

1111
func testProtobufSuccess() {
12+
// Temporarily gated due to https://openradar.appspot.com/49262697
13+
if #available(macOS 10.11, *) {
1214
let data = NSKeyedArchiver.archivedData(withRootObject: ["foo": 1, "bar": 2, "baz": 3])
1315
let parser = ProtobufDataParser()
1416

@@ -21,5 +23,6 @@ class ProtobufDataParserTests: XCTestCase {
2123
} catch {
2224
XCTFail()
2325
}
26+
}
2427
}
2528
}

0 commit comments

Comments
 (0)