From de0be72634aacd864d77d1c52fb80c3d5c671493 Mon Sep 17 00:00:00 2001
From: tangxifan <tangxifan@gmail.com>
Date: Fri, 1 Nov 2019 13:25:29 -0600
Subject: [PATCH] try to make travis install latest iVerilog

---
 .travis.yml       | 14 +-------------
 .travis/common.sh | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e433d4894..8697b0505 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ cache:
     - $TRAVIS_BUILD_DIR/ace2
     - $TRAVIS_BUILD_DIR/libs
     - $HOME/.ccache
+    - $HOME/deps
 
 # Currently sudo is not required, NO ENV is used
 
@@ -46,7 +47,6 @@ matrix:
           - gdb
           - git
           - gperf
-          - iverilog
           - libcairo2-dev
           - libevent-dev
           - libfontconfig1-dev
@@ -86,18 +86,6 @@ before_install:
   - source .travis/common.sh
 
 install:
-  - DEPS_DIR="${HOME}/deps"
-  - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
-  - |
-    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
   - cd -
   - .travis/install.sh
 
diff --git a/.travis/common.sh b/.travis/common.sh
index 1f39d6d50..b18667843 100644
--- a/.travis/common.sh
+++ b/.travis/common.sh
@@ -43,3 +43,29 @@ else
   export CXX=g++-8
 fi
 
+# 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
+  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
+# Install CMake
+if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+  IVERILOG_URL="ftp://icarus.com/pub/eda/verilog/v10//verilog-10.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
+  export PATH=${DEPS_DIR}/iverilog-10.3/bin:${PATH}
+  echo ${PATH}
+fi
+
+
+