Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert #46694 (Temporarily use the old Travis image) #46924

Merged
merged 2 commits into from
Dec 25, 2017
Merged

Revert #46694 (Temporarily use the old Travis image) #46924

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2352a88
Revert "Temporarily use the old Travis image."
kennytm Dec 21, 2017
8d76e28
Enable IPv6 support in Dockers to workaround travis-ci/travis-ci#8891.
kennytm Dec 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .travis.yml
View file
Open in desktop
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