commit 62cd2d1354666fb1b93d6d082c37fb298aa61866
parent 4c6ac73c9e07ec6230daa209f3d4c1607478627c
Author: Georges Dupéron <georges.duperon@gmail.com>
Date: Fri, 27 Jul 2018 19:35:58 +0200
Remove leftover "|| true" from Travis configuration debugging
Diffstat:
| M | .travis.yml | | | 46 | +++++++++++++++++++++------------------------- |
1 file changed, 21 insertions(+), 25 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
include:
- os: linux
env: MODE=self-test # Ensure that the Makefile works, especially with parallel builds.
- install: make -j 10 test
+ script: make -j 10 test
sudo: true
addons:
apt:
@@ -54,7 +54,12 @@ matrix:
- dosbox
- os: osx
env: MODE=osx-test # Ensure that the Makefile works. Check that the generated os.bat works in sh mode
- install: make all test/noemu test/macos
+ before_install:
+ - brew install cdrtools
+ - brew install mtools
+ - brew cask install gdisk
+ - brew install imagemagick # --with-x11
+ script: make all test/noemu test/macos
- os: linux
env: MODE=qemu-system-i386-floppy
sudo: false
@@ -100,27 +105,24 @@ matrix:
- *common_apt_packages
- bochs-sdl
-before_install:
- - brew install cdrtools || true
- - brew install mtools || true
- - brew cask install gdisk || true
- - brew install imagemagick || true # --with-x11
- - make --version || true
- - nasm -v || true
- - mtools --version || true
- - mtools || true
- - mkisofs --version || true
- - zip --help || true
- - unzip --version || true
- - gdisk --version || true
- - import --version || true
- - Xvfb -h || true
- - ssh -V || true
+install:
+ # TODO: put these in a Makefile target, to share the code with the appveyor configuration
+ - make --version
+ - nasm -v
+ - mtools --version
+ - mtools || true
+ - mkisofs --version
+ - zip --help
+ - unzip -h
+ - gdisk --version
+ - import --version || test "$MODE" = osx-test # import --version has a non-zero exit code on the Travis installation
+ - Xvfb -help
+ - ssh -V
- ./utils/install-sikulix.sh
- export PATH="$HOME/sikulix/:$PATH"
- if test "$MODE" = virtualbox -o "$MODE" = self-test; then ./utils/install-virtualbox.sh; fi
-install:
+script:
- make test/${MODE}
- |
./utils/auto-push.sh "https://github.com/jsmaniac/travis-os.git" \
@@ -130,8 +132,3 @@ install:
"edf345aad47e" \
"deploy-screenshots" \
"$(if test "$TRAVIS_BRANCH" = "master"; then echo master; else echo dev; fi)"
-
-# empty script, we want to have the commands neatly collapsed and Travis does
-# this only for some sections (install and before_install, but not script).
-script:
- - true
-\ No newline at end of file
