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

Upgrade Travis CI toolchains: Clang 5.0, GCC 7, xcode 9.3.

Browse Source
This commit is contained in:
Brian Smith 2018-05-17 11:37:11 -10:00
parent 56f0683e9a
commit 1670080572
3 changed files with 152 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

572
.travis.yml
View File

File diff suppressed because it is too large Load Diff

4
README.md
View File

@ -214,7 +214,7 @@ the table below. The C compilers listed are used for compiling the C portions.
<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, GCC 6, Clang 3.8</td>
<td>GCC 4.6, GCC 7, Clang 5</td>
<td rowspan=4><a href=https://travis-ci.org/briansmith/ring/branches>Build Status</a></td>
</tr>
<tr><td>32&#8209;bit&nbsp;ARM, AAarch64</td>
@ -228,7 +228,7 @@ the table below. The C compilers listed are used for compiling the C portions.
</tr>
<tr><td>Mac&nbsp;OS&nbsp;X</td>
<td>x64</td>
<td>Apple LLVM version 9.0.0 (clang-900.0.39.2) from Xcode 9.2</td>
<td>Apple LLVM version 9.0.0 (clang-900.0.39.2) from Xcode 9.3</td>
</tr>
<tr><td>Windows</td>
<td>x86, x86_64</td>

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

@ -17,8 +17,6 @@
import re
import shutil
latest_clang = "clang-4.0"
rusts = [
"stable",
"nightly",
@ -32,16 +30,10 @@ linux_compilers = [
# BoringSSL.
"",
# Pre-release of clang.
# XXX: clang 4.0 doesn't work:
# https://github.com/travis-ci/apt-package-whitelist/issues/3296
# "clang-4.0",
# Newest clang and GCC.
"clang-3.9",
"clang-5.0",
"gcc-5",
"gcc-6",
"gcc-7",
]
# Clang 3.4 and GCC 4.6 are already installed by default.
@ -177,7 +169,7 @@ def format_entry(os, target, compiler, rust, mode, features):
cc = get_cc(sys, compiler)
if os == "osx":
os += "\n" + entry_indent + "osx_image: xcode9.2"
os += "\n" + entry_indent + "osx_image: xcode9.3"
compilers = []
if cc != "":
@ -245,13 +237,10 @@ def get_linux_packages_to_install(target, compiler, arch, kcov):
def get_sources_for_package(package):
ubuntu_toolchain = "ubuntu-toolchain-r-test"
if package.startswith("clang-"):
if package == latest_clang:
llvm_toolchain = "llvm-toolchain-precise"
else:
_, version = package.split("-")
llvm_toolchain = "llvm-toolchain-precise-%s" % version
_, version = package.split("-")
llvm_toolchain = "llvm-toolchain-trusty-%s" % version
# Stuff in llvm-toolchain-precise depends on stuff in the toolchain
# Stuff in llvm-toolchain-trusty depends on stuff in the toolchain
# packages.
return [llvm_toolchain, ubuntu_toolchain]
else: