diff --git a/.travis.yml b/.travis.yml index 8697b0505..26fc7a768 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,6 @@ before_install: - source .travis/common.sh install: - - cd - - .travis/install.sh script: diff --git a/.travis/common.sh b/.travis/common.sh index 7f63d5d5f..c7c4a7cdd 100644 --- a/.travis/common.sh +++ b/.travis/common.sh @@ -42,3 +42,33 @@ else export CC=gcc-8 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 +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 + +iverilog --version + +# Go back to home directory +cd ${HOME} + diff --git a/.travis/install.sh b/.travis/install.sh index 2235f9266..16f848403 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -3,35 +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 - 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 -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 - -iverilog --version - -# Go back to home directory -cd ${HOME} - # Git repo fixup #start_section "environment.git" "Setting up ${YELLOW}git checkout${NC}" #set -x