mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 22:36:43 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2921 from OpenMW/travis_focal

Browse source 
Get OpenMW ready for Focal update on GH
This commit is contained in:
Bret Curtis 2020-06-22 16:45:30 +02:00 committed by GitHub
commit 573c630d34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
.travis.yml
View file

@ -14,10 +14,10 @@ addons:
apt: apt:
sources: sources:
- sourceline: 'ppa:openmw/openmw' - sourceline: 'ppa:openmw/openmw'
- ubuntu-toolchain-r-test # - ubuntu-toolchain-r-test # for GCC-10
packages: [ packages: [
# Dev # Dev
cmake, clang-tools, gcc-9, g++-9, ccache, build-essential, cmake, clang-tools, 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
@ -41,21 +41,14 @@ 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 Bionic GCC-7 - name: OpenMW (all) on Ubuntu Focal GCC-9
os: linux os: linux
dist: bionic dist: focal
sudo: required sudo: required
if: branch != coverity_scan if: branch != coverity_scan
- name: OpenMW (all) on Ubuntu Bionic GCC-9 - name: OpenMW (openmw) on Ubuntu Focal Clang-10 with Static Analysis
os: linux os: linux
dist: bionic dist: focal
sudo: required
env:
- MATRIX_EVAL="CC=gcc-9 && CXX=g++-9"
if: branch != coverity_scan
- name: OpenMW (openmw) on Ubuntu Bionic Clang-6 with Static Analysis
os: linux
dist: bionic
sudo: required sudo: required
env: env:
- MATRIX_EVAL="CC=clang && CXX=clang++" - MATRIX_EVAL="CC=clang && CXX=clang++"
@ -63,9 +56,9 @@ matrix:
- 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 Bionic Clang-6 with Static Analysis - name: OpenMW (openmw-cs and tools) on Ubuntu Focal Clang-10 with Static Analysis
os: linux os: linux
dist: bionic dist: focal
sudo: required sudo: required
env: env:
- MATRIX_EVAL="CC=clang && CXX=clang++" - MATRIX_EVAL="CC=clang && CXX=clang++"
@ -75,11 +68,13 @@ matrix:
compiler: clang compiler: clang
- name: OpenMW Components Coverity Scan - name: OpenMW Components Coverity Scan
os: linux os: linux
dist: bionic dist: focal
sudo: required sudo: required
if: branch = coverity_scan if: branch = coverity_scan
# allow_failures: # allow_failures:
# - name: OpenMW (openmw) on Ubuntu Bionic Clang-6 with Static Analysis # - name: OpenMW (openmw) on Ubuntu Focal with GCC-10
# env:
# - MATRIX_EVAL="CC=gcc-10 && CXX=g++-10"
before_install: before_install:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi