Skip to content

Commit

Permalink
Update to 6/29 snapshot
Browse files Browse the repository at this point in the history
  • Loading branch information
youming-lin committed Jul 5, 2017
1 parent f416ce6 commit bb4e4c0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ playground.xcworkspace
# Packages/
.build/
Packages/
Package.resolved

# CocoaPods
#
Expand Down
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,21 @@ matrix:
- os: linux
dist: trusty
sudo: required
env: SWIFT_VERSION=3.0.2
env: SWIFT_SNAPSHOT=3.0.2
- os: linux
dist: trusty
sudo: required
env: SWIFT_VERSION=4.0-DEVELOPMENT-SNAPSHOT-2017-06-11-a
env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-29-a
- os: osx
osx_image: xcode8.3
sudo: required
- os: osx
osx_image: xcode8.3
osx_image: xcode9
sudo: required
env: SWIFT_VERSION=4.0-DEVELOPMENT-SNAPSHOT-2017-06-11-a
env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-29-a

before_install:
- git clone https://github.com/IBM-Swift/Package-Builder.git
- test -n "$SWIFT_VERSION" && echo "$SWIFT_VERSION" > .swift-version || echo "SWIFT_VERSION not set, using $(cat .swift-version)"

script:
- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
9 changes: 7 additions & 2 deletions Tests/ConfigurationTests/ConfigurationManagerTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,18 @@ class ConfigurationManagerTest: XCTestCase {
// ran from .build directory on Linux
#else
// Force rebuild of test executable on OSX
(errPipe, outPipe, exitCode) = shell("swift", "build", "-C", projectFolder.path)

// Need to pass in current environment variables on local machine or it will fail with
// `error: Unable to find executable for 'xcrun'`
// when ran with Xcode 9 beta
(errPipe, outPipe, exitCode) = shell("swift", "build", "-C", projectFolder.path, environment: ProcessInfo.processInfo.environment)
output = String(data: outPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)

print(output ?? "No stdout from `swift build -C \(projectFolder.path)`")

guard exitCode == 0 else {
XCTFail("Unable to build project")
let error = String(data: errPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)
XCTFail(error ?? "No stderr from `swift build -C \(projectFolder.path)`")
return
}
#endif
Expand Down

0 comments on commit bb4e4c0

Please sign in to comment.