aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-17 15:42:34 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-17 15:42:34 +0000
commit2794471d89ad6045e2dd948fb6a9d17815977684 (patch)
treef5166410e1cbd1d2399e88537632c88c54bf3d6c
parent5365d8818dfceb59f0eb2e70dc718487597241fd (diff)
downloadruby-2794471d89ad6045e2dd948fb6a9d17815977684.tar.gz
.travis.yml: revert r65131 too
because it succeeded https://travis-ci.org/ruby/ruby/jobs/442733840. It looks that it randomly succeeds. Let's just leave it and see how stable it is, starting from `allow_failures` because it hasn't hanged only once so far. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index cbbcf38..0249c43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,15 +70,15 @@ matrix:
install:
before_script: chmod -R u+w spec/ruby
script: ruby -C spec/ruby ../mspec/bin/mspec -j .
+ allow_failures:
+ # It randomly hangs on travis osx. Let's remove this from allow_failures once it gets stable.
+ - os: osx
before_install: |
: ${CONFIG_FLAG=}
case "$TRAVIS_OS_NAME" in
- linux) JOBS=-j`nproc`
- TEST_ALL_JOBS="$JOBS" ;;
+ linux) JOBS=-j`nproc` ;;
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/
@@ -119,7 +119,7 @@ before_script:
script:
- "make -s test TESTOPTS=--color=never"
- - "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-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.