Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'travis-script'

Browse Source 
Improve Travis CI build script: make build commands easier to read and modify
in .travis.yml and make their output in Travis logs more readable too.

Closes https://github.com/wxWidgets/wxWidgets/pull/388
This commit is contained in:
Vadim Zeitlin
2017-01-07 23:22:13 +01:00
parent fad9c688e6 f08305ae33
commit 60d33cb165
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
.travis.yml
View File

@@ -21,7 +21,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
compiler: clang compiler: clang
env: wxCONFIGURE_FLAGS="--enable-cxx11" wxMAKEFILE_FLAGS="CXXFLAGS='-std=c++11 -stdlib=libc++'" wxSKIP_SAMPLES=1 env: wxCONFIGURE_FLAGS="--enable-cxx11" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" wxSKIP_SAMPLES=1
branches: branches:
only: only:
@@ -37,25 +37,23 @@ notifications:
before_install: ./build/tools/before_install.sh before_install: ./build/tools/before_install.sh
script: | script:
echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r' && - set -e && echo 'Configuring...' && echo -en 'travis_fold:start:script.configure\\r'
./configure --disable-optimise $wxCONFIGURE_FLAGS && - ./configure --disable-optimise $wxCONFIGURE_FLAGS
echo -en 'travis_fold:end:script.1\\r' && - echo -en 'travis_fold:end:script.configure\\r'
echo 'Building...' && echo -en 'travis_fold:start:script.2\\r' && - echo 'Building...' && echo -en 'travis_fold:start:script.build\\r'
make && - make
echo -en 'travis_fold:end:script.2\\r' && - echo -en 'travis_fold:end:script.build\\r'
echo 'Testing...' && echo -en 'travis_fold:start:script.3\\r' && - echo 'Testing...' && echo -en 'travis_fold:start:script.test\\r'
make -C tests && - make -C tests && pushd tests && ./test -t && popd
pushd tests && - echo -en 'travis_fold:end:script.test\\r'
./test -t && - echo 'Building samples...' && echo -en 'travis_fold:start:script.samples\\r'
popd && - (test "$wxSKIP_SAMPLES" && echo 'SKIPPED') || make samples
echo -en 'travis_fold:end:script.3\\r' && - echo -en 'travis_fold:end:script.samples\\r'
echo 'Building the samples...' && echo -en 'travis_fold:start:script.4\\r' && - echo 'Installing...' && echo -en 'travis_fold:start:script.install\\r'
(test -n "$wxSKIP_SAMPLES" && make samples || echo "*** Skipping building samples ***") && - sudo make install
echo -en 'travis_fold:end:script.4\\r' && - echo -en 'travis_fold:end:script.install\\r'
echo 'Installing...' && echo -en 'travis_fold:start:script.5\\r' && - echo 'Testing installation...' && echo -en 'travis_fold:start:script.testinstall\\r'
sudo make install && - make -C samples/minimal -f makefile.unx clean
echo -en 'travis_fold:end:script.5\\r' && - make -C samples/minimal -f makefile.unx $wxMAKEFILE_FLAGS
echo 'Testing building with the installed version...' && echo -en 'travis_fold:start:script.6\\r' && - echo -en 'travis_fold:end:script.testinstall\\r'
make -C samples/minimal -f makefile.unx $wxMAKEFILE_FLAGS &&
echo -en 'travis_fold:end:script.6\\r'