Merge pull request #2732 from OpenMW/travis_ci_bionic

bump to bionic; gcc-9 and clang-10

.travis.yml

@@ -15,10 +15,9 @@ addons:
     sources:
       - sourceline: 'ppa:openmw/openmw'
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-xenial-7
     packages: [
       # Dev
-      cmake, clang-7, clang-tools-7, gcc-8, g++-8, ccache,
+      cmake, clang-tools, gcc-9, g++-9, ccache,
       # Boost
       libboost-filesystem-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-system-dev,
       # FFmpeg
@@ -42,45 +41,45 @@ matrix:
       os: osx
       osx_image: xcode10.2
       if: branch != coverity_scan
-    - name: OpenMW (all) on Ubuntu Xenial GCC-5
+    - name: OpenMW (all) on Ubuntu Xenial GCC-7
       os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       if: branch != coverity_scan
-    - name: OpenMW (all) on Ubuntu Xenial GCC-8
+    - name: OpenMW (all) on Ubuntu Xenial GCC-9
       os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       env:
-        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+        - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9"
       if: branch != coverity_scan
-    - name: OpenMW (openmw) on Ubuntu Xenial Clang-7 with Static Analysis
+    - name: OpenMW (openmw) on Ubuntu Xenial Clang-6 with Static Analysis
       os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       env:
-        - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
-        - ANALYZE="scan-build-7 --force-analyze-debug-code --use-cc clang-7 --use-c++ clang++-7"
+        - MATRIX_EVAL="CC=clang && CXX=clang++"
+        - ANALYZE="scan-build --force-analyze-debug-code --use-cc clang --use-c++ clang++"
         - BUILD_OPENMW_CS="OFF"
       if: branch != coverity_scan
       compiler: clang
-    - name: OpenMW (openmw-cs) on Ubuntu Xenial Clang-7 with Static Analysis
+    - name: OpenMW (openmw-cs) on Ubuntu Xenial Clang-6 with Static Analysis
       os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       env:
-        - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
-        - ANALYZE="scan-build-7 --force-analyze-debug-code --use-cc clang-7 --use-c++ clang++-7"
+        - MATRIX_EVAL="CC=clang && CXX=clang++"
+        - ANALYZE="scan-build --force-analyze-debug-code --use-cc clang --use-c++ clang++"
         - BUILD_OPENMW="OFF"
       if: branch != coverity_scan
       compiler: clang
     - name: OpenMW Components Coverity Scan
       os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       if: branch = coverity_scan
 #   allow_failures:
-#    - name: OpenMW (openmw) on Ubuntu Xenial Clang-7 with Static Analysis
+#    - name: OpenMW (openmw) on Ubuntu Xenial Clang-6 with Static Analysis
 
 before_install:
     - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi

CI/before_install.linux.sh

@@ -1,4 +1,4 @@
 #!/bin/bash -ex
 
-sudo ln -sf /usr/bin/clang-7 /usr/local/bin/clang
-sudo ln -sf /usr/bin/clang++-7 /usr/local/bin/clang++
+#sudo ln -sf /usr/bin/clang-6 /usr/local/bin/clang
+#sudo ln -sf /usr/bin/clang++-6 /usr/local/bin/clang++