yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add GCC 6 to Travis CI.

Browse Source
This commit is contained in:
Brian Smith 2016-06-15 09:19:16 -10:00
parent 75c43905c9
commit 7f4f5d16e0
3 changed files with 153 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
.travis.yml
View File

@ -229,6 +229,56 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=i686-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=DEBUG KCOV=0
rust: stable
os: linux
addons:
apt:
packages:
- g++-6
- g++-6-multilib
- gcc-6
- gcc-6-multilib
- linux-libc-dev:i386
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=i686-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=RELWITHDEBINFO KCOV=0
rust: stable
os: linux
addons:
apt:
packages:
- g++-6
- g++-6-multilib
- gcc-6
- gcc-6-multilib
- linux-libc-dev:i386
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=x86_64-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=DEBUG KCOV=0
rust: stable
os: linux
addons:
apt:
packages:
- g++-6
- gcc-6
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=x86_64-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=RELWITHDEBINFO KCOV=0
rust: stable
os: linux
addons:
apt:
packages:
- g++-6
- gcc-6
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=x86_64-apple-darwin CC_X=clang CXX_X=clang++ MODE_X=DEBUG KCOV=0
rust: nightly
os: osx
@ -331,6 +381,56 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=i686-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=DEBUG KCOV=0
rust: nightly
os: linux
addons:
apt:
packages:
- g++-6
- g++-6-multilib
- gcc-6
- gcc-6-multilib
- linux-libc-dev:i386
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=i686-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=RELWITHDEBINFO KCOV=0
rust: nightly
os: linux
addons:
apt:
packages:
- g++-6
- g++-6-multilib
- gcc-6
- gcc-6-multilib
- linux-libc-dev:i386
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=x86_64-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=DEBUG KCOV=0
rust: nightly
os: linux
addons:
apt:
packages:
- g++-6
- gcc-6
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=x86_64-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=RELWITHDEBINFO KCOV=0
rust: nightly
os: linux
addons:
apt:
packages:
- g++-6
- gcc-6
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=x86_64-apple-darwin CC_X=clang CXX_X=clang++ MODE_X=DEBUG KCOV=0
rust: beta
os: osx
@ -423,6 +523,56 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=i686-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=DEBUG KCOV=0
rust: beta
os: linux
addons:
apt:
packages:
- g++-6
- g++-6-multilib
- gcc-6
- gcc-6-multilib
- linux-libc-dev:i386
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=i686-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=RELWITHDEBINFO KCOV=0
rust: beta
os: linux
addons:
apt:
packages:
- g++-6
- g++-6-multilib
- gcc-6
- gcc-6-multilib
- linux-libc-dev:i386
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=x86_64-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=DEBUG KCOV=0
rust: beta
os: linux
addons:
apt:
packages:
- g++-6
- gcc-6
sources:
- ubuntu-toolchain-r-test
- env: TARGET_X=x86_64-unknown-linux-gnu CC_X=gcc-6 CXX_X=g++-6 MODE_X=RELWITHDEBINFO KCOV=0
rust: beta
os: linux
addons:
apt:
packages:
- g++-6
- gcc-6
sources:
- ubuntu-toolchain-r-test
# END GENERATED
script: if [[ "$TARGET_X" =~ ^a*.*linux-.*eabi ]]; then travis_wait 60 mk/travis.sh; else mk/travis.sh; fi

4
README.md
View File

@ -120,8 +120,8 @@ listed in the table below.
<tr><th>OS</th><th>Arch.</th><th>Compilers</th><th>Status</th>
<tr><td rowspan=2>Linux</td>
<td>x86, x86_64</td>
<td>GCC 4.6, GCC 5, Clang 3.8. (Clang builds are temporarily disabled due
to the current LLVM APT repo outage.)</td>
<td>GCC 4.6, GCC 5, GCC 6, Clang 3.8. (Clang builds are temporarily
disabled due the current LLVM APT repo outage.)</td>
<td rowspan=4><a title="Build Status" href=https://travis-ci.org/briansmith/ring><img src=https://travis-ci.org/briansmith/ring.svg?branch=master></a>
</tr>
<tr><td>32&#8209;bit&nbsp;ARM, AAarch64</td>

3
mk/update-travis-yml.py
View File

@ -42,9 +42,8 @@ linux_compilers = [
# APT servers, which we need to download clang.
# "clang-3.8",
# XXX: GCC 6 doesn't work:
# https://github.com/travis-ci/apt-package-whitelist/issues/2294
"gcc-5",
"gcc-6",
]
# Clang 3.4 and GCC 4.6 are already installed by default.