Ensure that Travis collapses the output of the commands
This commit is contained in:
parent
229e259fe4
commit
aad6ef80d2
13
.travis.yml
13
.travis.yml
|
@ -26,7 +26,7 @@ matrix:
|
||||||
include:
|
include:
|
||||||
- os: linux
|
- os: linux
|
||||||
env: MODE=self-test # Ensure that the Makefile works, especially with parallel builds.
|
env: MODE=self-test # Ensure that the Makefile works, especially with parallel builds.
|
||||||
script: make -j 10 test
|
install: make -j 10 test
|
||||||
sudo: true
|
sudo: true
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
|
@ -98,11 +98,11 @@ matrix:
|
||||||
- dosbox
|
- dosbox
|
||||||
- os: osx
|
- os: osx
|
||||||
env: MODE=osx-test # Ensure that the Makefile works. Check that the generated os.bat works in sh mode
|
env: MODE=osx-test # Ensure that the Makefile works. Check that the generated os.bat works in sh mode
|
||||||
script: make all
|
install: make all
|
||||||
# TODO: install sikulix
|
# TODO: install sikulix
|
||||||
# TODO: test in SH mode
|
# TODO: test in SH mode
|
||||||
|
|
||||||
install:
|
before_install:
|
||||||
- make --version || true
|
- make --version || true
|
||||||
- nasm -v || true
|
- nasm -v || true
|
||||||
- mtools --version || true
|
- mtools --version || true
|
||||||
|
@ -112,7 +112,7 @@ install:
|
||||||
- export PATH="$HOME/sikulix/:$PATH"
|
- export PATH="$HOME/sikulix/:$PATH"
|
||||||
- if test "$MODE" = virtualbox -o "$MODE" = self-test; then ./utils/install-virtualbox.sh; fi
|
- if test "$MODE" = virtualbox -o "$MODE" = self-test; then ./utils/install-virtualbox.sh; fi
|
||||||
|
|
||||||
script:
|
install:
|
||||||
- make test/${MODE}
|
- make test/${MODE}
|
||||||
- |
|
- |
|
||||||
./utils/auto-push.sh "https://github.com/jsmaniac/travis-os.git" \
|
./utils/auto-push.sh "https://github.com/jsmaniac/travis-os.git" \
|
||||||
|
@ -122,3 +122,8 @@ script:
|
||||||
"edf345aad47e" \
|
"edf345aad47e" \
|
||||||
"deploy-screenshots" \
|
"deploy-screenshots" \
|
||||||
"$(if test "$TRAVIS_BRANCH" = "master"; then echo master; else echo dev; fi)"
|
"$(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
|
Loading…
Reference in New Issue
Block a user