summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Aruga <jaruga@redhat.com>2020-03-18 14:31:11 +0100
committerYusuke Endoh <mame@ruby-lang.org>2020-03-21 11:51:32 +0900
commit86ca640287eccc8426b87903cac1ec428d7ede8b (patch)
tree1b2315a779d302f4f64126b0d6be58d7015fd444
parent7cc7627c2d4db91f1097c7f1c5f5c9a41aeaefc6 (diff)
Enablie IPv6 on Travis s390s case again.
It seems the issue was fixed by Travis. See https://travis-ci.community/t/6719/5 .
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/2970
-rw-r--r--.travis.yml2
-rwxr-xr-xtool/travis_disable_ipv6.sh11
2 files changed, 0 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index ab2edd1..e26fe1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -133,8 +133,6 @@ env:
name: s390x-linux
arch: s390x
<<: *gcc-8
- env:
- - BEFORE_INSTALL="tool/travis_disable_ipv6.sh"
- &jemalloc
name: --with-jemalloc
diff --git a/tool/travis_disable_ipv6.sh b/tool/travis_disable_ipv6.sh
deleted file mode 100755
index 97ba179..0000000
--- a/tool/travis_disable_ipv6.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -ex
-ip a
-sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1
-sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1
-sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=1
-ip a
-
-cat /etc/hosts
-sudo ruby -e "hosts = File.read('/etc/hosts').sub(/^::1\s*localhost.*$/, ''); File.write('/etc/hosts', hosts)"
-cat /etc/hosts