Update our continuous integration machinery (#1889)

* Update our continuous integration machinery

Ubuntu 16.04 can now be used with travis. Updating all the other stuff
when there.
Invoking the lld linker seems to save 5 minutes with clang on linux.

No functional change.

* fix

diff --git a/.travis.yml b/.travis.yml
index ded29e479cd7866019686dc72e92416676082b7c..ea5bda1d2bb15e915642ad191f00ef30f8d55385 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: cpp
 sudo: required
 language: cpp
 sudo: required

-dist: trusty
+dist: xenial

 
 matrix:
   include:
 
 matrix:
   include:


@@ -9,21 +9,21 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']

-          packages: ['g++-7', 'g++-7-multilib', 'g++-multilib', 'valgrind', 'expect', 'curl']
+          packages: ['g++-8', 'g++-8-multilib', 'g++-multilib', 'valgrind', 'expect', 'curl']

       env:
       env:

-        - COMPILER=g++-7
+        - COMPILER=g++-8

         - COMP=gcc
 
     - os: linux
       compiler: clang
       addons:
         apt:
         - COMP=gcc
 
     - os: linux
       compiler: clang
       addons:
         apt:

-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
-          packages: ['clang-5.0', 'llvm-5.0-dev', 'g++-multilib', 'valgrind', 'expect', 'curl']
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-6.0']
+          packages: ['clang-6.0', 'llvm-6.0-dev', 'g++-multilib', 'valgrind', 'expect', 'curl']

       env:
       env:

-        - COMPILER=clang++-5.0
+        - COMPILER=clang++-6.0

         - COMP=clang
         - COMP=clang

-        - LDFLAGS=-fuse-ld=gold
+        - LDFLAGS=-fuse-ld=lld

 
     - os: osx
       compiler: gcc
 
     - os: osx
       compiler: gcc


@@ -34,7 +34,7 @@ matrix:
     - os: osx
       compiler: clang
       env:
     - os: osx
       compiler: clang
       env:

-        - COMPILER=clang++ V='Apple LLVM 6.0' # Apple LLVM version 6.0 (clang-600.0.54) (based on LLVM 3.5svn)
+        - COMPILER=clang++ V='Apple LLVM 9.4.1' # Apple LLVM version 9.1.0 (clang-902.0.39.2)

         - COMP=clang
 
 branches:
         - COMP=clang
 
 branches:


@@ -69,6 +69,6 @@ script:
   #
   # Sanitizer
   #
   #
   # Sanitizer
   #

-  # Use g++-7 as a proxy for having sanitizers, might need revision as they become available for more recent versions of clang/gcc
-  - if [[ "$COMPILER" == "g++-7" ]]; then make clean && make -j2 ARCH=x86-64 sanitize=undefined optimize=no debug=yes build > /dev/null && ../tests/instrumented.sh --sanitizer-undefined; fi
-  - if [[ "$COMPILER" == "g++-7" ]]; then make clean && make -j2 ARCH=x86-64 sanitize=thread    optimize=no debug=yes build > /dev/null && ../tests/instrumented.sh --sanitizer-thread; fi
+  # Use g++-8 as a proxy for having sanitizers, might need revision as they become available for more recent versions of clang/gcc
+  - if [[ "$COMPILER" == "g++-8" ]]; then make clean && make -j2 ARCH=x86-64 sanitize=undefined optimize=no debug=yes build > /dev/null && ../tests/instrumented.sh --sanitizer-undefined; fi
+  - if [[ "$COMPILER" == "g++-8" ]]; then make clean && make -j2 ARCH=x86-64 sanitize=thread    optimize=no debug=yes build > /dev/null && ../tests/instrumented.sh --sanitizer-thread; fi

diff --git a/appveyor.yml b/appveyor.yml
index c81869b58dbc6b7bcf626c42d3d7bab0c598ba70..21f3bbe326b20d8ba4a79ee1c3ac2b8f5f3d306a 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ branches:
     - appveyor
 
 # Operating system (build VM template)
     - appveyor
 
 # Operating system (build VM template)

-os: Visual Studio 2015
+os: Visual Studio 2017

 
 # Build platform, i.e. x86, x64, AnyCPU. This setting is optional.
 platform:
 
 # Build platform, i.e. x86, x64, AnyCPU. This setting is optional.
 platform:


@@ -51,7 +51,7 @@ before_build:
       $b = git log HEAD | sls "\b[Bb]ench[ :]+[0-9]{7}" | select -first 1
       $bench = $b -match '\D+(\d+)' | % { $matches[1] }
       Write-Host "Reference bench:" $bench
       $b = git log HEAD | sls "\b[Bb]ench[ :]+[0-9]{7}" | select -first 1
       $bench = $b -match '\D+(\d+)' | % { $matches[1] }
       Write-Host "Reference bench:" $bench

-      $g = "Visual Studio 14 2015"
+      $g = "Visual Studio 15 2017"

       If (${env:PLATFORM} -eq 'x64') { $g = $g + ' Win64' }
       cmake -G "${g}" .
       Write-Host "Generated files for: " $g
       If (${env:PLATFORM} -eq 'x64') { $g = $g + ' Win64' }
       cmake -G "${g}" .
       Write-Host "Generated files for: " $g