diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-08-15 06:48:40 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-08-15 06:48:40 -0700 |
| commit | 91f6cdfef6af69b7fe9203ee4d501ab6e6f1a830 (patch) | |
| tree | b749ff51dec39f145cc25a1df262de7412f5c45a /.travis.yml | |
| parent | 1551e14d2d688982f22f416a55a3212796a82421 (diff) | |
| parent | 704686774e28b9b602874264df2c0f96841be05e (diff) | |
| download | yosys-91f6cdfef6af69b7fe9203ee4d501ab6e6f1a830.tar.gz yosys-91f6cdfef6af69b7fe9203ee4d501ab6e6f1a830.tar.bz2 yosys-91f6cdfef6af69b7fe9203ee4d501ab6e6f1a830.zip | |
Merge remote-tracking branch 'origin/master' into eddie/fix_1284_again
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 |