From 480478e5452015d890315f5d1e59c6b53d52e2c8 Mon Sep 17 00:00:00 2001
From: tangxifan <tangxifan@gmail.com>
Date: Fri, 1 Nov 2019 15:12:08 -0600
Subject: [PATCH] reorganizing travis

---
 .travis.yml        | 30 ++++++++++++++++++++++++++++++
 .travis/install.sh | 36 ------------------------------------
 2 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26fc7a768..d4bfb426f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,6 +86,36 @@ before_install:
   - source .travis/common.sh
 
 install:
+# Install necessary package which is not available on Travis CI 
+  - DEPS_DIR="${HOME}/deps"
+  - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
+# Install CMake
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      CMAKE_URL="https://cmake.org/files/v3.13/cmake-3.13.0-rc3-Linux-x86_64.tar.gz"
+      mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
+      export PATH=${DEPS_DIR}/cmake/bin:${PATH}
+      echo ${PATH}
+    else
+      brew install cmake || brew upgrade cmake
+    fi
+  - cmake --version
+# Install latest iVerilog. Since no deb is provided, compile from source codes
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      IVERILOG_URL="https://github.com/steveicarus/iverilog/archive/v10_3.tar.gz"
+      mkdir iverilog-10.3 && travis_retry wget --no-check-certificate --quiet -O - ${IVERILOG_URL} | tar --strip-components=1 -xz -C iverilog-10.3
+      cd iverlog-10.3
+      sh autoconf.sh --prefix=${DEPS_DIR}/iverilog-10.3/bin
+      ./configure --prefix=${DEPS_DIR}/iverilog-10.3/bin
+      make -j4
+      make check
+      make install --prefix=${HOME}/iverilog-10.3/bin
+      export PATH=${DEPS_DIR}/iverilog-10.3/bin:${PATH}
+      echo ${PATH}
+    fi
+  - iverilog --version
+  - cd -
   - .travis/install.sh
 
 script:
diff --git a/.travis/install.sh b/.travis/install.sh
index fd9e353f9..16f848403 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -3,42 +3,6 @@
 source .travis/common.sh
 set -e
 
-# Install necessary package which is not available on Travis CI 
-export DEPS_DIR="${HOME}/deps"
-mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
-
-# Install CMake
-if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-  export CMAKE_URL="https://cmake.org/files/v3.13/cmake-3.13.0-rc3-Linux-x86_64.tar.gz"
-  mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
-  export PATH=${DEPS_DIR}/cmake/bin:${PATH}
-  echo ${PATH}
-else
-  brew install cmake || brew upgrade cmake
-fi
-
-cmake --version
-
-# Install latest iVerilog. Since no deb is provided, compile from source codes
-if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-  export IVERILOG_URL="https://github.com/steveicarus/iverilog/archive/v10_3.tar.gz"
-  mkdir iverilog-10.3 && travis_retry wget --no-check-certificate --quiet -O - ${IVERILOG_URL} | tar --strip-components=1 -xz -C iverilog-10.3
-  cd iverlog-10.3
-  sh autoconf.sh --prefix=${DEPS_DIR}/iverilog-10.3/bin
-  ./configure --prefix=${DEPS_DIR}/iverilog-10.3/bin
-  make -j4
-  make check
-  make install --prefix=${HOME}/iverilog-10.3/bin
-  export PATH=${DEPS_DIR}/iverilog-10.3/bin:${PATH}
-  echo ${PATH}
-fi
-
-iverilog --version
-
-# Go back to home directory
-cd -
-
-
 # Git repo fixup
 #start_section "environment.git" "Setting up ${YELLOW}git checkout${NC}"
 #set -x