diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-08-15 10:20:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 10:20:22 +0200 |
| commit | 5422007400bf6f9860d1a230b561fe4fa64f0d32 (patch) | |
| tree | 9bbda83f2b0afb9ddcd407f13161549f8defd989 | |
| parent | e2797f13084931b55d7f1759cdedfecd9eb91268 (diff) | |
| parent | 4c2a2e275f67778bcfb40a983d9ba868cbe04ebc (diff) | |
| download | yosys-5422007400bf6f9860d1a230b561fe4fa64f0d32.tar.gz yosys-5422007400bf6f9860d1a230b561fe4fa64f0d32.tar.bz2 yosys-5422007400bf6f9860d1a230b561fe4fa64f0d32.zip | |
Merge pull request #1295 from YosysHQ/eddie/fix_travis
Fix Travis CI
| -rw-r--r-- | .travis.yml | 39 | ||||
| -rwxr-xr-x | .travis/setup.sh | 2 |
2 files changed, 6 insertions, 35 deletions
diff --git a/.travis.yml b/.travis.yml index 4102f05fe..09f380831 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,35 +40,6 @@ matrix: env: - MATRIX_EVAL="CONFIG=gcc && CC=gcc-4.8 && CXX=g++-4.8" - # Latest gcc-6 on Travis Linux - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - - gperf - - build-essential - - bison - - flex - - libreadline-dev - - gawk - - tcl-dev - - libffi-dev - - git - - graphviz - - xdot - - pkg-config - - python - - python3 - - libboost-system-dev - - libboost-python-dev - - libboost-filesystem-dev - - zlib1g-dev - env: - - MATRIX_EVAL="CONFIG=gcc && CC=gcc-6 && CXX=g++-6" - # Latest gcc supported on Travis Linux - os: linux addons: @@ -76,7 +47,7 @@ matrix: sources: - ubuntu-toolchain-r-test packages: - - g++-7 + - g++-9 - gperf - build-essential - bison @@ -96,7 +67,7 @@ matrix: - libboost-filesystem-dev - zlib1g-dev env: - - MATRIX_EVAL="CONFIG=gcc && CC=gcc-7 && CXX=g++-7" + - MATRIX_EVAL="CONFIG=gcc && CC=gcc-9 && CXX=g++-9" # Clang which ships on Trusty Linux - os: linux @@ -133,9 +104,9 @@ matrix: addons: apt: sources: - - llvm-toolchain-trusty-5.0 + - llvm-toolchain-xenial-8 packages: - - clang-5.0 + - clang-8 - gperf - build-essential - bison @@ -155,7 +126,7 @@ matrix: - libboost-filesystem-dev - zlib1g-dev env: - - MATRIX_EVAL="CONFIG=clang && CC=clang-5.0 && CXX=clang++-5.0" + - MATRIX_EVAL="CONFIG=clang && CC=clang-8 && CXX=clang++-8" # # Latest clang on Mac OS X # - os: osx diff --git a/.travis/setup.sh b/.travis/setup.sh index 4af0b8ee9..02879b974 100755 --- a/.travis/setup.sh +++ b/.travis/setup.sh @@ -51,7 +51,7 @@ fi git clone git://github.com/steveicarus/iverilog.git cd iverilog autoconf - ./configure --prefix=$HOME/.local-bin + CC=gcc CXX=g++ ./configure --prefix=$HOME/.local-bin make make install echo |