mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-20 09:53:51 +00:00
Merge pull request #2732 from OpenMW/travis_ci_bionic
bump to bionic; gcc-9 and clang-10
This commit is contained in:
commit
a7e77d74eb
2 changed files with 18 additions and 19 deletions
33
.travis.yml
33
.travis.yml
|
@ -15,10 +15,9 @@ addons:
|
||||||
sources:
|
sources:
|
||||||
- sourceline: 'ppa:openmw/openmw'
|
- sourceline: 'ppa:openmw/openmw'
|
||||||
- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
- llvm-toolchain-xenial-7
|
|
||||||
packages: [
|
packages: [
|
||||||
# Dev
|
# Dev
|
||||||
cmake, clang-7, clang-tools-7, gcc-8, g++-8, ccache,
|
cmake, clang-tools, 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
|
||||||
|
@ -42,45 +41,45 @@ matrix:
|
||||||
os: osx
|
os: osx
|
||||||
osx_image: xcode10.2
|
osx_image: xcode10.2
|
||||||
if: branch != coverity_scan
|
if: branch != coverity_scan
|
||||||
- name: OpenMW (all) on Ubuntu Xenial GCC-5
|
- name: OpenMW (all) on Ubuntu Xenial GCC-7
|
||||||
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-6 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 && CXX=clang++"
|
||||||
- ANALYZE="scan-build-7 --force-analyze-debug-code --use-cc clang-7 --use-c++ clang++-7"
|
- ANALYZE="scan-build --force-analyze-debug-code --use-cc clang --use-c++ clang++"
|
||||||
- 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-6 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 && CXX=clang++"
|
||||||
- ANALYZE="scan-build-7 --force-analyze-debug-code --use-cc clang-7 --use-c++ clang++-7"
|
- ANALYZE="scan-build --force-analyze-debug-code --use-cc clang --use-c++ clang++"
|
||||||
- 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-6 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-6 /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++
|
||||||
|
|
Loading…
Reference in a new issue