Skip to content

Commit

Permalink
Merge pull request scottrhoyt#17 from scottrhoyt/update_swift_version
Browse files Browse the repository at this point in the history
Update Swift versions.
  • Loading branch information
scottrhoyt authored Jan 1, 2017
2 parents 98c5efa + 7f4e9bf commit b101a26
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0.2
22 changes: 4 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ matrix:
- script: set -o pipefail && xcodebuild -scheme SwiftyTextTable -project SwiftyTextTable.xcodeproj clean build test | xcpretty
env: JOB=Xcode
os: osx
osx_image: xcode8
osx_image: xcode8.2
language: objective-c
before_install:
- ./scripts/upstall-carthage.sh
Expand All @@ -23,31 +23,17 @@ matrix:
- TOOLCHAINS=swift swift test
env: JOB=SPM
os: osx
osx_image: xcode8
osx_image: xcode8.2
language: objective-c
before_install:
- export SWIFT_SNAPSHOT=swift-DEVELOPMENT-SNAPSHOT-2016-09-07-a
- curl https://swift.org/builds/development/xcode/$SWIFT_SNAPSHOT/$SWIFT_SNAPSHOT-osx.pkg -o swift.pkg
- sudo installer -pkg swift.pkg -target /
- script:
- swift build
- swift test
env: JOB=Linux
sudo: required
dist: trusty
language: generic
before_install:
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
- cd ..
- gpg --keyserver hkp://pool.sks-keyservers.net --refresh-keys Swift
- export SWIFT_SNAPSHOT=swift-DEVELOPMENT-SNAPSHOT-2016-09-07-a
- export SWIFT_URL=https://swift.org/builds/development/ubuntu1404/$SWIFT_SNAPSHOT/$SWIFT_SNAPSHOT-ubuntu14.04.tar.gz
- wget $SWIFT_URL
- wget $SWIFT_URL.sig
- gpg --verify $SWIFT_SNAPSHOT-ubuntu14.04.tar.gz.sig
- tar xzf $SWIFT_SNAPSHOT-ubuntu14.04.tar.gz
- export PATH="${PWD}/${SWIFT_SNAPSHOT}-ubuntu14.04/usr/bin:${PATH}"
- cd SwiftyTextTable
install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"

exclude:
- script: placeholder # workaround for https://github.com/travis-ci/travis-ci/issues/4681
Expand Down

0 comments on commit b101a26

Please sign in to comment.