Skip to content

Commit 0cd6758

Browse files
committed
Auto merge of #46924 - kennytm:revert-46694, r=aidanhs
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
2 parents a6fc844 + 8d76e28 commit 0cd6758

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.travis.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: shell
22
sudo: required
33
dist: trusty
4-
group: deprecated-2017Q4
54
services:
65
- docker
76

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

195201
install:
196202
- case "$TRAVIS_OS_NAME" in

0 commit comments

Comments
 (0)