From 95d03de160393194297ed7f5bce55e979df73ebd Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 12 Sep 2018 20:12:34 +0200 Subject: [PATCH] Update .travis.yml --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c737fbb0..4c264c08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,8 @@ compiler: before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -f Dockerfile -t strawberry-build . ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -d -p 127.0.0.1:80:4567 strawberry-build ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker ps -a ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run strawberry-build ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -itd --name build strawberry-build ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build git clone https://github.com/jonaski/strawberry /repo ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install git glib pkgconfig protobuf protobuf-c qt ; fi @@ -24,7 +23,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install chromaprint ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export Qt5_DIR=/usr/local/opt/qt5/lib/cmake ; fi before_script: - - mkdir build - - cd build - - cmake .. -DFORCE_GIT_REVISION="0.0.0-0-g0000000" -script: make -j8 + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; docker exec build cmake -H/repo -B/build ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; mkdir build; cd build; cmake .. -DFORCE_GIT_REVISION="0.0.0-0-g0000000"; fi +script: +- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; docker exec build make -j8 ; fi +- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; make -j8 ; fi