diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-18 01:10:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-18 01:10:56 +0000 |
| commit | c3982a1aa658beea6a045b5e17958fd8fc063720 (patch) | |
| tree | 99976091946ac4e3f37a92b20fc610a65fbea337 | |
| parent | fd360dd93abe77fd18992b715c7ad295d1dfd02a (diff) | |
.travis.yml: split before_install into the matrix
* .travis.yml (before_install): split shell commands into the
matrix per OSs, so that the commands will appear in the logs
separately.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | .travis.yml | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 0249c43d3a..095f70516b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,13 +55,25 @@ matrix: compiler: gcc env: - "CONFIG_FLAG='--with-gmp --with-jemalloc --with-valgrind'" + before_install: &prepare_linux + - "JOBS=-j`nproc`" - os: linux compiler: gcc-8 + before_install: *prepare_linux - os: osx 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.1:/usr/local/opt/zlib'" + before_install: + - "JOBS=-j`sysctl -n hw.activecpu`" + # 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.1 + - /usr/local/opt/openssl@1.1/bin/openssl version - os: linux language: ruby rvm: 2.3 @@ -74,21 +86,6 @@ matrix: # 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` ;; - osx) JOBS=-j`sysctl -n hw.activecpu` - : 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.1 - /usr/local/opt/openssl@1.1/bin/openssl version - ;; - esac - before_script: - "echo JOBS=$JOBS" - "uname -a" |