Skip to content

Commit 9bce2e7

Browse files
authored
Merge pull request #109 from Carthage/swift4-build-matrix
[CI] Test against 4.0-DEVELOPMENT-SNAPSHOT
2 parents b80f8a7 + be1dfd2 commit 9bce2e7

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.travis.yml

+14
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ matrix:
1414
language: objective-c
1515
env: JOB=Xcode8
1616
- script:
17+
- swift --version
1718
- swift build
1819
- SWIFTPM_TEST_Commandant=YES swift test
1920
os: osx
2021
osx_image: xcode8.3
2122
language: objective-c
2223
env: JOB=SPM
2324
- script:
25+
- swift --version
2426
- swift build
2527
- SWIFTPM_TEST_Commandant=YES swift test
2628
env: JOB=Linux
@@ -29,6 +31,18 @@ matrix:
2931
language: generic
3032
install:
3133
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
34+
- script:
35+
- swift --version
36+
- swift build
37+
- SWIFTPM_TEST_Commandant=YES swift test
38+
env:
39+
- JOB=Linux
40+
- SWIFT_VERSION=4.0-DEVELOPMENT-SNAPSHOT-2017-06-11-a
41+
sudo: required
42+
dist: trusty
43+
language: generic
44+
install:
45+
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
3246

3347
notifications:
3448
email: false

Package.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ let package = Package(
1818
]
1919
}
2020
return deps
21-
}()
21+
}(),
22+
swiftLanguageVersions: [3, 4]
2223
)

Tests/CommandantTests/CommandSpec.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ struct NoOptionsCommand: CommandProtocol {
3333
var function: String { return "function" }
3434

3535
func run(_ options: NoOptions<CommandantError<()>>) -> Result<(), CommandantError<()>> {
36-
return .success()
36+
return .success(())
3737
}
3838
}

0 commit comments

Comments
 (0)