diff options
author | Clifford Wolf <clifford@clifford.at> | 2019-08-15 10:22:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-15 10:22:59 +0200 |
commit | 85b0b2c58989402d8b2a4bcade264e28dc246778 (patch) | |
tree | e81654955cedfd7e06339db4004d7860ee0b1e55 /.travis.yml | |
parent | b25cf3685666b66daa7e6a82f137ad3d633a17aa (diff) | |
parent | 5422007400bf6f9860d1a230b561fe4fa64f0d32 (diff) | |
download | yosys-85b0b2c58989402d8b2a4bcade264e28dc246778.tar.gz yosys-85b0b2c58989402d8b2a4bcade264e28dc246778.tar.bz2 yosys-85b0b2c58989402d8b2a4bcade264e28dc246778.zip |
Merge branch 'master' into clifford/ids
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 39 |
1 files changed, 5 insertions, 34 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 |