summaryrefslogtreecommitdiffstatshomepage
path: root/.travis.yml
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-10-18 16:30:48 +0200
committer R. Belmont <rb6502@users.noreply.github.com>2019-10-18 10:30:48 -0400
commit93a1cde67d59325cb541adef03a532bb08155230 (patch)
tree0ca0d7cf45de3fee5ec67d80d778d6a6cb02da9e /.travis.yml
parent14f2ce1a37dee5f8ba2e774dcb04778fd3b4da69 (diff)
Continuous integration improvements (#5703)
* Add workaround for imgtool and jedutil failing vs2019 debug builds with /ZI * No longer allow msvc build to fail * Enable tools build for travis to make it more useful * Switch travis to Xcode 11 in order to fix nltool linking failure * Prefer 64-bit compiler with VS 2019 too * Setting PreferredToolArchitecture to x64 is not needed, genie puts it into the project files for vs2015 or later * OPTIMIZE=1 build is faster that OPTIMIZE=0 for some reason. So fast in fact, that TOOLS=1 can be enabled without hitting the 60 minute timeout * Switch MINGW build to VS 2017 image until appveyor figure out why builds on VS 2019 are almost twice as slow * Run pacman twice to account for core system upgrades
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index b2ee70b0e1b..122accc565c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ os:
- linux
- osx
dist: bionic
+osx_image: xcode11
matrix:
exclude:
- os: osx
@@ -17,11 +18,11 @@ env:
script:
- if [ $TRAVIS_OS_NAME == 'linux' ]; then
if [ $CC == 'clang' ]; then
- make -j2 IGNORE_GIT=1 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" && ./$MAME -validate;
- else make -j4 IGNORE_GIT=1 OPTIMIZE=0 OVERRIDE_CC="gcc-9" OVERRIDE_CXX="g++-9" && ./$MAME -validate;
+ make -j2 IGNORE_GIT=1 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" TOOLS=1 && ./$MAME -validate;
+ else make -j4 IGNORE_GIT=1 OPTIMIZE=0 OVERRIDE_CC="gcc-9" OVERRIDE_CXX="g++-9" TOOLS=1 && ./$MAME -validate;
fi
elif [ $TRAVIS_OS_NAME == 'osx' ]; then
- unset LDOPTS && make -j2 OPTIMIZE=0 USE_LIBSDL=1 && ./$MAME -validate;
+ unset LDOPTS && make -j2 OPTIMIZE=0 USE_LIBSDL=1 TOOLS=1 && ./$MAME -validate;
fi
sudo: required
before_install: