bump to bionic; gcc-9 and clang-10

pull/2732/head
Bret Curtis 5 years ago
parent ed06fc2aa8
commit 5091e2c371

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

@ -1,4 +1,4 @@
#!/bin/bash -ex #!/bin/bash -ex
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++-7 /usr/local/bin/clang++ sudo ln -sf /usr/bin/clang++-10 /usr/local/bin/clang++

Loading…
Cancel
Save