aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-17 15:13:36 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-17 15:13:36 +0000
commit5365d8818dfceb59f0eb2e70dc718487597241fd (patch)
treece5feb5595ea506b56e90c17467e3dd284c9ce55
parentf9f22eeef395b13e5bb0317abed2973acf9bb20c (diff)
downloadruby-5365d8818dfceb59f0eb2e70dc718487597241fd.tar.gz
revert r65124 and try non-parallel test-all on osx
OpenSSL error was fixed but r65124 hanged too https://travis-ci.org/ruby/ruby/jobs/442727035. So it seems to be an independent issue. Let me try removing -j. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml15
1 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index f1ba734..cbbcf38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ addons:
- gdbm
- gmp
- libffi
- - openssl@1.0
+ - openssl@1.1
- zlib
matrix:
@@ -61,7 +61,7 @@ matrix:
compiler: clang
# We are not going to make rdoc here; that is to be done above.
env:
- - "CONFIG_FLAG='--disable-install-docs --with-opt-dir=/usr/local/opt/openssl@1.0:/usr/local/opt/zlib'"
+ - "CONFIG_FLAG='--disable-install-docs --with-opt-dir=/usr/local/opt/openssl@1.1:/usr/local/opt/zlib'"
- os: linux
language: ruby
rvm: 2.3
@@ -74,15 +74,18 @@ matrix:
before_install: |
: ${CONFIG_FLAG=}
case "$TRAVIS_OS_NAME" in
- linux) JOBS=-j`nproc` ;;
+ linux) JOBS=-j`nproc`
+ TEST_ALL_JOBS="$JOBS" ;;
osx) JOBS=-j`sysctl -n hw.activecpu`
+ : parallel test-all hangs on travis osx build for now.
+ TEST_ALL_JOBS=""
: Bare "brew update" nukes everything.
: These steps are very carefully chosen to avoid breaking things.
brew_core_dir=/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
git -C $brew_core_dir fetch -q origin
git -C $brew_core_dir checkout -q 25590710e3f7af9cfa173c5cd3eb41a0532107b6
- HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade openssl@1.0
- /usr/local/opt/openssl@1.0/bin/openssl version
+ HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade openssl@1.1
+ /usr/local/opt/openssl@1.1/bin/openssl version
;;
esac
@@ -116,7 +119,7 @@ before_script:
script:
- "make -s test TESTOPTS=--color=never"
- - "make -s $JOBS test-all -o exts TESTOPTS='-q --color=never --job-status=normal' RUBY_FORCE_TEST_JIT=1"
+ - "make -s $TEST_ALL_JOBS test-all -o exts TESTOPTS='-q --color=never --job-status=normal' RUBY_FORCE_TEST_JIT=1"
- "make -s $JOBS test-spec MSPECOPT=-j"
# Branch matrix. Not all branches are Travis-ready so we limit branches here.