Use multiple commands in Travis CI build script
Using a single long command was always inconvenient and started displaying the
build results strangely since starting to build the samples conditionally in
62d2f4e5f5
, so try using multiple commands with
"set -e" to ensure that we abort the build as soon as possible.
This commit is contained in:
parent
5b88196311
commit
dcef4d4a9e
41
.travis.yml
41
.travis.yml
@ -37,25 +37,22 @@ notifications:
|
||||
|
||||
before_install: ./build/tools/before_install.sh
|
||||
|
||||
script: |
|
||||
echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r' &&
|
||||
./configure --disable-optimise $wxCONFIGURE_FLAGS &&
|
||||
echo -en 'travis_fold:end:script.1\\r' &&
|
||||
echo 'Building...' && echo -en 'travis_fold:start:script.2\\r' &&
|
||||
make &&
|
||||
echo -en 'travis_fold:end:script.2\\r' &&
|
||||
echo 'Testing...' && echo -en 'travis_fold:start:script.3\\r' &&
|
||||
make -C tests &&
|
||||
pushd tests &&
|
||||
./test -t &&
|
||||
popd &&
|
||||
echo -en 'travis_fold:end:script.3\\r' &&
|
||||
echo 'Building the samples...' && echo -en 'travis_fold:start:script.4\\r' &&
|
||||
(test -n "$wxSKIP_SAMPLES" && make samples || echo "*** Skipping building samples ***") &&
|
||||
echo -en 'travis_fold:end:script.4\\r' &&
|
||||
echo 'Installing...' && echo -en 'travis_fold:start:script.5\\r' &&
|
||||
sudo make install &&
|
||||
echo -en 'travis_fold:end:script.5\\r' &&
|
||||
echo 'Testing building with the installed version...' && echo -en 'travis_fold:start:script.6\\r' &&
|
||||
make -C samples/minimal -f makefile.unx $wxMAKEFILE_FLAGS &&
|
||||
echo -en 'travis_fold:end:script.6\\r'
|
||||
script:
|
||||
- set -e && echo 'Configuring...' && echo -en 'travis_fold:start:script.configure\\r'
|
||||
- ./configure --disable-optimise $wxCONFIGURE_FLAGS
|
||||
- echo -en 'travis_fold:end:script.configure\\r'
|
||||
- echo 'Building...' && echo -en 'travis_fold:start:script.build\\r'
|
||||
- make
|
||||
- echo -en 'travis_fold:end:script.build\\r'
|
||||
- echo 'Testing...' && echo -en 'travis_fold:start:script.test\\r'
|
||||
- make -C tests && pushd tests && ./test -t && popd
|
||||
- echo -en 'travis_fold:end:script.test\\r'
|
||||
- echo 'Building samples...' && echo -en 'travis_fold:start:script.samples\\r'
|
||||
- (test "$wxSKIP_SAMPLES" && echo 'SKIPPED') || make samples
|
||||
- echo -en 'travis_fold:end:script.samples\\r'
|
||||
- echo 'Installing...' && echo -en 'travis_fold:start:script.install\\r'
|
||||
- sudo make install
|
||||
- echo -en 'travis_fold:end:script.install\\r'
|
||||
- echo 'Testing installation...' && echo -en 'travis_fold:start:script.testinstall\\r'
|
||||
- make -C samples/minimal -f makefile.unx $wxMAKEFILE_FLAGS
|
||||
- echo -en 'travis_fold:end:script.testinstall\\r'
|
||||
|
Loading…
Reference in New Issue
Block a user