squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #46924 - kennytm:revert-46694, r=aidanhs

Browse source 
Revert #46694 (Temporarily use the old Travis image)

This PR reverts #46694, and applies the solution recommended in https://github.com/travis-ci/travis-ci/issues/8891#issuecomment-353403729.

r? @aidanhs
This commit is contained in:
bors 2017-12-25 07:29:16 +00:00
commit 0cd67581e7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -1,7 +1,6 @@
language: shell language: shell
sudo: required sudo: required
dist: trusty dist: trusty
group: deprecated-2017Q4
services: services:
- docker - docker
@ -191,6 +190,13 @@ env:
before_install: before_install:
- zcat $HOME/docker/rust-ci.tar.gz | docker load || true - zcat $HOME/docker/rust-ci.tar.gz | docker load || true
- mkdir -p $HOME/rustsrc - 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: install:
- case "$TRAVIS_OS_NAME" in - case "$TRAVIS_OS_NAME" in