From 5091e2c371178396eecc8391993339a8adb27bb0 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Sun, 22 Mar 2020 20:56:48 +0100 Subject: [PATCH 1/5] bump to bionic; gcc-9 and clang-10 --- .travis.yml | 32 ++++++++++++++++---------------- CI/before_install.linux.sh | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89b5317a2a..c2f2d3f7f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,10 @@ addons: sources: - sourceline: 'ppa:openmw/openmw' - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-7 + - llvm-toolchain-bionic-10 packages: [ # Dev - cmake, clang-7, clang-tools-7, gcc-8, g++-8, ccache, + cmake, clang-10, clang-tools-10, gcc-9, g++-9, ccache, # Boost libboost-filesystem-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-system-dev, # FFmpeg @@ -44,43 +44,43 @@ matrix: if: branch != coverity_scan - name: OpenMW (all) on Ubuntu Xenial GCC-5 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-10 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-10 && CXX=clang++-10" + - ANALYZE="scan-build-10 --force-analyze-debug-code --use-cc clang-10 --use-c++ clang++-10" - 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-10 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-10 && CXX=clang++-10" + - ANALYZE="scan-build-10 --force-analyze-debug-code --use-cc clang-10 --use-c++ clang++-10" - 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-10 with Static Analysis before_install: - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh index fd4e4829c9..30f38dd924 100755 --- a/CI/before_install.linux.sh +++ b/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-10 /usr/local/bin/clang +sudo ln -sf /usr/bin/clang++-10 /usr/local/bin/clang++ From f2f5b1104fc031a28eb2fb38940fbccc645827a1 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Sun, 22 Mar 2020 21:19:44 +0100 Subject: [PATCH 2/5] try clang-6 since that is officially in repo --- .travis.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2f2d3f7f1..1ce58a3dfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,9 @@ addons: sources: - sourceline: 'ppa:openmw/openmw' - ubuntu-toolchain-r-test - - llvm-toolchain-bionic-10 packages: [ # Dev - cmake, clang-10, clang-tools-10, gcc-9, g++-9, ccache, + cmake, clang-6, clang-tools-6, gcc-9, g++-9, ccache, # Boost libboost-filesystem-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-system-dev, # FFmpeg @@ -54,23 +53,23 @@ matrix: env: - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" if: branch != coverity_scan - - name: OpenMW (openmw) on Ubuntu Xenial Clang-10 with Static Analysis + - name: OpenMW (openmw) on Ubuntu Xenial Clang-6 with Static Analysis os: linux dist: bionic sudo: required env: - - MATRIX_EVAL="CC=clang-10 && CXX=clang++-10" - - ANALYZE="scan-build-10 --force-analyze-debug-code --use-cc clang-10 --use-c++ clang++-10" + - MATRIX_EVAL="CC=clang-6 && CXX=clang++-6" + - ANALYZE="scan-build-6 --force-analyze-debug-code --use-cc clang-6 --use-c++ clang++-6" - BUILD_OPENMW_CS="OFF" if: branch != coverity_scan compiler: clang - - name: OpenMW (openmw-cs) on Ubuntu Xenial Clang-10 with Static Analysis + - name: OpenMW (openmw-cs) on Ubuntu Xenial Clang-6 with Static Analysis os: linux dist: bionic sudo: required env: - - MATRIX_EVAL="CC=clang-10 && CXX=clang++-10" - - ANALYZE="scan-build-10 --force-analyze-debug-code --use-cc clang-10 --use-c++ clang++-10" + - MATRIX_EVAL="CC=clang-6 && CXX=clang++-6" + - ANALYZE="scan-build-6 --force-analyze-debug-code --use-cc clang-6 --use-c++ clang++-6" - BUILD_OPENMW="OFF" if: branch != coverity_scan compiler: clang @@ -80,7 +79,7 @@ matrix: sudo: required if: branch = coverity_scan # allow_failures: -# - name: OpenMW (openmw) on Ubuntu Xenial Clang-10 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 From 0a96f4c847732ba1d7c5e0bb551765f34b7bc08c Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Sun, 22 Mar 2020 21:27:44 +0100 Subject: [PATCH 3/5] get the default... --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ce58a3dfa..a6b09c681d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ addons: - ubuntu-toolchain-r-test packages: [ # Dev - cmake, clang-6, clang-tools-6, gcc-9, g++-9, ccache, + cmake, clang-tools, gcc-9, g++-9, ccache, # Boost libboost-filesystem-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-system-dev, # FFmpeg @@ -41,7 +41,7 @@ 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: bionic sudo: required From 42640b781198e45efebdc0e27484a455af7bc13f Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Sun, 22 Mar 2020 21:34:46 +0100 Subject: [PATCH 4/5] no need to re-map when using system default --- CI/before_install.linux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh index 30f38dd924..eff3fd7196 100755 --- a/CI/before_install.linux.sh +++ b/CI/before_install.linux.sh @@ -1,4 +1,4 @@ #!/bin/bash -ex -sudo ln -sf /usr/bin/clang-10 /usr/local/bin/clang -sudo ln -sf /usr/bin/clang++-10 /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++ From 3fc5c499fb851cab468e264c25fbd90291e4e764 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Sun, 22 Mar 2020 21:40:43 +0100 Subject: [PATCH 5/5] another try for system clang --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a6b09c681d..780f4b1036 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,8 +58,8 @@ matrix: dist: bionic sudo: required env: - - MATRIX_EVAL="CC=clang-6 && CXX=clang++-6" - - ANALYZE="scan-build-6 --force-analyze-debug-code --use-cc clang-6 --use-c++ clang++-6" + - 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 @@ -68,8 +68,8 @@ matrix: dist: bionic sudo: required env: - - MATRIX_EVAL="CC=clang-6 && CXX=clang++-6" - - ANALYZE="scan-build-6 --force-analyze-debug-code --use-cc clang-6 --use-c++ clang++-6" + - 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