diff --git a/.travis.yml b/.travis.yml index fde4fc9c7..1a113ce92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,38 +87,6 @@ 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 -p 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" - travis_retry wget --no-clobber --no-check-certificate --quiet -O - ${IVERILOG_URL} - mkdir -p iverilog-10_3 - tar -xz v10_3.tar.gz - 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 -V - - cd - - .travis/install.sh script: diff --git a/.travis/install.sh b/.travis/install.sh index 16f848403..49e14d11a 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -3,6 +3,39 @@ 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 -p 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" + travis_retry wget --no-clobber --no-check-certificate --quiet -O - ${IVERILOG_URL} + mkdir -p iverilog-10_3 + tar -xz v10_3.tar.gz + 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 -V +cd - + + # Git repo fixup #start_section "environment.git" "Setting up ${YELLOW}git checkout${NC}" #set -x