[前][次][番号順一覧][スレッド一覧]

ruby-changes:52928

From: nobu <ko1@a...>
Date: Thu, 18 Oct 2018 10:11:05 +0900 (JST)
Subject: [ruby-changes:52928] nobu:r65142 (trunk): .travis.yml: split before_install into the matrix

nobu	2018-10-18 10:10:56 +0900 (Thu, 18 Oct 2018)

  New Revision: 65142

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65142

  Log:
    .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.

  Modified files:
    trunk/.travis.yml
Index: .travis.yml
===================================================================
--- .travis.yml	(revision 65141)
+++ .travis.yml	(revision 65142)
@@ -55,13 +55,25 @@ matrix: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L55
       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...:/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...
+        - /usr/local/opt/openssl@1.../bin/openssl version
     - os: linux
       language: ruby
       rvm: 2.3
@@ -74,21 +86,6 @@ matrix: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L86
     # 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...
-         /usr/local/opt/openssl@1.../bin/openssl version
-         ;;
-  esac
-
 before_script:
   - "echo JOBS=$JOBS"
   - "uname -a"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]