Limit travis jobs to one per OS.

With the removal of Travis' OSS tier, we now have a limited amount of build time left that needs to last as long as possible.
This commit is contained in:
Pentarctagon 2020-11-20 10:24:25 -06:00
parent b63b8a959a
commit 90f3255f08
No known key found for this signature in database
GPG Key ID: 9456BC54A21DBFA0

View File

@ -25,45 +25,45 @@ branches:
jobs: jobs:
include: include:
- os: windows # - os: windows
env: TOOL=msbuild NLS=false IMAGE=VC16 BRANCH=master CFG=Debug UPLOAD=true # env: TOOL=msbuild NLS=false IMAGE=VC16 BRANCH=master CFG=Debug UPLOAD=true
- os: windows - os: windows
env: TOOL=msbuild NLS=false IMAGE=VC16 BRANCH=master CFG=Release env: TOOL=msbuild NLS=false IMAGE=VC16 BRANCH=master CFG=Release
- os: osx # - os: osx
osx_image: xcode11.3 # osx_image: xcode11.3
compiler: clang # compiler: clang
env: TOOL=xcodebuild NLS=true CFG=Debug BRANCH=master UPLOAD=true # env: TOOL=xcodebuild NLS=true CFG=Debug BRANCH=master UPLOAD=true
- os: osx - os: osx
osx_image: xcode11.3 osx_image: xcode11.3
compiler: clang compiler: clang
env: TOOL=xcodebuild NLS=true CFG=Release BRANCH=master env: TOOL=xcodebuild NLS=true CFG=Release BRANCH=master
- compiler: gcc # - compiler: gcc
env: TOOL=scons CXXSTD=14 NLS=only IMAGE=2004 BRANCH=master CFG=release # env: TOOL=scons CXXSTD=14 NLS=only IMAGE=2004 BRANCH=master CFG=release
- env: TOOL=scons CXXSTD=14 NLS=true IMAGE=mingw BRANCH=master CFG=release STRICT=false UPLOAD=true # - env: TOOL=scons CXXSTD=14 NLS=true IMAGE=mingw BRANCH=master CFG=release STRICT=false UPLOAD=true
- env: TOOL=scons CXXSTD=14 NLS=false IMAGE=steamrt BRANCH=master CFG=release CC=gcc-5 CXX=g++-5 # - env: TOOL=scons CXXSTD=14 NLS=false IMAGE=steamrt BRANCH=master CFG=release CC=gcc-5 CXX=g++-5
- env: TOOL=scons NLS=true IMAGE=flatpak BRANCH=master # - env: TOOL=scons NLS=true IMAGE=flatpak BRANCH=master
- compiler: gcc - compiler: gcc
env: TOOL=scons CXXSTD=17 NLS=false IMAGE=2004 BRANCH=master CFG=release VALIDATE=true LTO=true env: TOOL=scons CXXSTD=17 NLS=false IMAGE=2004 BRANCH=master CFG=release VALIDATE=true LTO=true
- compiler: gcc # - compiler: gcc
env: TOOL=scons CXXSTD=14 NLS=false IMAGE=2004 BRANCH=master CFG=debug UPLOAD=true # env: TOOL=scons CXXSTD=14 NLS=false IMAGE=2004 BRANCH=master CFG=debug UPLOAD=true
- compiler: gcc # - compiler: gcc
env: TOOL=cmake CXXSTD=14 NLS=false IMAGE=2004 BRANCH=master CFG=Release # env: TOOL=cmake CXXSTD=14 NLS=false IMAGE=2004 BRANCH=master CFG=Release
- compiler: clang # - compiler: clang
env: TOOL=cmake CXXSTD=14 NLS=false IMAGE=2004 BRANCH=master CFG=Debug # env: TOOL=cmake CXXSTD=14 NLS=false IMAGE=2004 BRANCH=master CFG=Debug
- compiler: gcc # - compiler: gcc
env: TOOL=scons CXXSTD=14 NLS=false IMAGE=1804 BRANCH=master CFG=debug UPLOAD=true # env: TOOL=scons CXXSTD=14 NLS=false IMAGE=1804 BRANCH=master CFG=debug UPLOAD=true
install: install:
- . ./utils/travis/steps/install.sh - . ./utils/travis/steps/install.sh