Skip to content

Commit

Permalink
Auto merge of #46924 - kennytm:revert-46694, r=aidanhs
Browse files Browse the repository at this point in the history
Revert #46694 (Temporarily use the old Travis image)

This PR reverts #46694, and applies the solution recommended in travis-ci/travis-ci#8891 (comment).

r? @aidanhs
  • Loading branch information
bors committed Dec 25, 2017
2 parents a6fc844 + 8d76e28 commit 0cd6758
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: shell
sudo: required
dist: trusty
group: deprecated-2017Q4
services:
- docker

Expand Down Expand Up @@ -191,6 +190,13 @@ env:
before_install:
- zcat $HOME/docker/rust-ci.tar.gz | docker load || true
- mkdir -p $HOME/rustsrc
# FIXME(#46924): these two commands are required to enable IPv6,
# they shouldn't exist, please revert once more official solutions appeared.
# see https://github.com/travis-ci/travis-ci/issues/8891#issuecomment-353403729
- if [ "$TRAVIS_OS_NAME" = linux ]; then
echo '{"ipv6":true,"fixed-cidr-v6":"fe80::/64"}' | sudo tee /etc/docker/daemon.json;
sudo service docker restart;
fi

install:
- case "$TRAVIS_OS_NAME" in
Expand Down

0 comments on commit 0cd6758

Please sign in to comment.