Skip to content

Commit

Permalink
Updates to latest Swift 4.0 image.
Browse files Browse the repository at this point in the history
  • Loading branch information
kzaher committed Jul 30, 2017
1 parent a06719c commit 187c903
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0-DEVELOPMENT-SNAPSHOT-2017-07-11-a
4.0-DEVELOPMENT-SNAPSHOT-2017-07-28-a
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ install:

script:
- if [[ `uname` == "Linux" ]] ; then
. ~/.swiftenv/init;
swiftenv install 4.0-DEVELOPMENT-SNAPSHOT-2017-07-11-a || true;
swiftenv install 4.0-DEVELOPMENT-SNAPSHOT-2017-07-28-a || true;
fi
- if [[ "${DANGER}" -eq 1 ]] ; then
bundle install --path vendor/bundle;
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [[ `uname` == "Darwin" ]]; then
trap cleanup EXIT
echo "Running linux"
eval $(docker-machine env default)
docker exec -it rx bash -c "cd /projects/RxSwift; scripts/test-linux.sh"
docker exec -it rx4.0 bash -c "cd /projects/RxSwift; scripts/test-linux.sh"
elif [[ `uname` == "Linux" ]]; then
CONFIGURATIONS=(debug release)

Expand Down

0 comments on commit 187c903

Please sign in to comment.