Fix MacOS builds on Travis (#475)
* use defaults where possible, simplify .travis.yml and fix macos builds while we are at it * de-duplicate code * specifically ask for xcode12.2
This commit is contained in:
parent
63a4ee4c1e
commit
c5cbd53024
40
.travis.yml
40
.travis.yml
@ -1,4 +1,6 @@
|
|||||||
language: cpp
|
language: cpp
|
||||||
|
os: linux
|
||||||
|
dist: bionic
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
@ -9,55 +11,33 @@ sudo: false
|
|||||||
|
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
sources:
|
packages: [ build-essential, cmake, clang, clang-tools, libsdl2-dev ]
|
||||||
- ubuntu-toolchain-r-test
|
|
||||||
- llvm-toolchain-xenial-7
|
|
||||||
packages: [ cmake, clang-7, clang-tools-7, gcc-8, g++-8, libsdl2-dev ]
|
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- name: Recastnavigation (all) on MacOS xcode9.4
|
- name: Recastnavigation on MacOS using XCode
|
||||||
os: osx
|
os: osx
|
||||||
osx_image: xcode9.4
|
osx_image: xcode12.2
|
||||||
before_install:
|
before_install:
|
||||||
- brew update
|
- brew update
|
||||||
- brew install sdl2
|
- brew install sdl2
|
||||||
if: branch != coverity_scan
|
if: branch != coverity_scan
|
||||||
- name: Recastnavigation on Ubuntu Xenial GCC-5
|
- name: Recastnavigation on Ubuntu GCC
|
||||||
os: linux
|
|
||||||
dist: xenial
|
|
||||||
sudo: required
|
|
||||||
if: branch != coverity_scan
|
if: branch != coverity_scan
|
||||||
- name: Recastnavigation on Ubuntu Xenial GCC-8
|
- name: Recastnavigation on Ubuntu GCC using Premake5
|
||||||
os: linux
|
|
||||||
dist: xenial
|
|
||||||
sudo: required
|
|
||||||
env:
|
|
||||||
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
|
|
||||||
if: branch != coverity_scan
|
|
||||||
- name: Recastnavigation on Ubuntu Xenial GCC-5 using Premake5
|
|
||||||
os: linux
|
|
||||||
dist: xenial
|
|
||||||
sudo: required
|
|
||||||
if: branch != coverity_scan
|
if: branch != coverity_scan
|
||||||
before_install:
|
before_install:
|
||||||
- wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz -O premake.tar.gz
|
- wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz -O premake.tar.gz
|
||||||
- tar -xf premake.tar.gz
|
- tar -xf premake.tar.gz
|
||||||
env:
|
env:
|
||||||
- PREMAKE=1
|
- PREMAKE=1
|
||||||
- name: Recastnavigation on Ubuntu Xenial Clang-7 with Static Analysis
|
- name: Recastnavigation on Ubuntu Clang with Static Analysis
|
||||||
os: linux
|
|
||||||
dist: xenial
|
|
||||||
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++"
|
||||||
if: branch != coverity_scan
|
if: branch != coverity_scan
|
||||||
compiler: clang
|
compiler: clang
|
||||||
- name: Recastnavigation Coverity Scan
|
- name: Recastnavigation Coverity Scan
|
||||||
os: linux
|
|
||||||
dist: xenial
|
|
||||||
sudo: required
|
|
||||||
if: branch = coverity_scan
|
if: branch = coverity_scan
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user