From ae996e93f0ddfb8e2a93d49c6d7edc1478ad60c1 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 23 Jun 2019 11:48:02 +0300
Subject: [PATCH] Travis CI: Update to Xenial image

Xenial is used by default on Travis as of now.

This commit contains the following changes
* number of make parallel jobs is reduced to 8 when building cppcheck
* clang-5.0 is replaced with clang
* sudo:required is removed (for sanitized builds)
---
 .travis.yml | 57 +++++++++++++++--------------------------------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e97b3fa..1801ebc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,10 @@ matrix:
     compiler: clang
     env:
     - CFLAGS_EXTRA="-march=native -std=c11"
+  - os: linux
+    compiler: clang
+    env:
+    - CFLAGS_EXTRA="-O3 -march=native -std=c11 -D AO_BL_SIZE=4 -D DEFAULT_NTHREADS=32"
   - os: linux
     compiler: gcc
     env:
@@ -57,8 +61,16 @@ matrix:
         - gcc-multilib
     compiler: clang
     env:
-    - CFLAGS_EXTRA="-m32 -march=native"
+    - CFLAGS_EXTRA="-m32"
     - CONF_OPTIONS="--enable-assertions"
+  - os: linux
+    addons:
+      apt:
+        packages:
+        - gcc-multilib
+    compiler: clang
+    env:
+    - CFLAGS_EXTRA="-m32 -O3 -march=native"
   - os: linux
     addons:
       apt:
@@ -105,27 +117,6 @@ matrix:
     env:
     - CFLAGS_EXTRA="-D DONT_USE_MMAP -O3"
     - CONF_OPTIONS="--enable-assertions --enable-shared"
-  - os: linux
-    addons:
-      apt:
-        packages:
-        - clang-5.0
-        sources:
-        - llvm-toolchain-trusty-5.0
-    compiler: clang-5.0
-    env:
-    - CFLAGS_EXTRA="-O3 -march=native -std=c11 -D AO_BL_SIZE=4 -D DEFAULT_NTHREADS=32"
-  - os: linux
-    addons:
-      apt:
-        packages:
-        - clang-5.0
-        - gcc-multilib
-        sources:
-        - llvm-toolchain-trusty-5.0
-    compiler: clang-5.0
-    env:
-    - CFLAGS_EXTRA="-m32 -O3 -march=native"
   - os: linux
     addons:
       apt:
@@ -186,19 +177,11 @@ matrix:
     env:
     - CFLAGS_EXTRA="-fsanitize=address -D AO_USE_ALMOST_LOCK_FREE -fno-omit-frame-pointer"
     - TESTS_CUSTOM_RUN=true
-    sudo: required
   - os: linux
-    addons:
-      apt:
-        packages:
-        - clang-5.0
-        sources:
-        - llvm-toolchain-trusty-5.0
-    compiler: clang-5.0
+    compiler: clang
     env:
     - CFLAGS_EXTRA="-fsanitize=address -march=native -fno-common -fno-omit-frame-pointer"
     - CONF_OPTIONS="--enable-assertions"
-    sudo: required
   - os: linux
     compiler: gcc
     env:
@@ -216,7 +199,6 @@ matrix:
     env:
     - CFLAGS_EXTRA="-fsanitize=address -m32 -march=native -fno-omit-frame-pointer"
     - LDFLAGS="-fuse-ld=gold"
-    sudo: required
   - os: osx
     env:
     - CFLAGS_EXTRA="-fsanitize=address -m32 -fno-omit-frame-pointer"
@@ -225,7 +207,6 @@ matrix:
     env:
     - CFLAGS_EXTRA="-fsanitize=memory,undefined -march=native -fno-omit-frame-pointer"
     - TESTS_CUSTOM_RUN=true
-    sudo: required
   - os: linux
     compiler: clang
     env:
@@ -259,13 +240,7 @@ matrix:
     - CPPCHECK_ENABLE="-q --enable=unusedFunction -D AO_TEST_EMULATION"
     - MAKEFILE_TARGET=all
   - os: linux
-    addons:
-      apt:
-        packages:
-        - clang-5.0
-        sources:
-        - llvm-toolchain-trusty-5.0
-    compiler: clang-5.0
+    compiler: clang
     env:
     - CSA_CHECK=true
     - MAKEFILE_TARGET=all
@@ -553,7 +528,7 @@ before_install:
     CPPCHECK_VER=master;
     git clone --depth=3 https://github.com/danmar/cppcheck.git
             ~/cppcheck -b $CPPCHECK_VER;
-    make --directory ~/cppcheck -j CXXFLAGS="-O3 -march=native -D NDEBUG";
+    make --directory ~/cppcheck -j8 CXXFLAGS="-O3 -march=native -D NDEBUG";
   fi
 - if [[ "$CROSS_GCC_VER" != "" ]]; then
     if [[ "$NOLIBC_DELIM" == "" ]]; then NOLIBC_DELIM=-; fi;
-- 
2.50.0