Update .travis.yml

This commit is contained in:
Jonas Kvinge 2018-09-12 20:12:34 +02:00 committed by GitHub
parent d43190a41f
commit 95d03de160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions

View File

@ -11,9 +11,8 @@ compiler:
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -f Dockerfile -t strawberry-build . ; fi - 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 run -itd --name build strawberry-build ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker ps -a ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build git clone https://github.com/jonaski/strawberry /repo ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run strawberry-build ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; 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 unlink python ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install git glib pkgconfig protobuf protobuf-c qt ; 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 brew install chromaprint ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export Qt5_DIR=/usr/local/opt/qt5/lib/cmake ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export Qt5_DIR=/usr/local/opt/qt5/lib/cmake ; fi
before_script: before_script:
- mkdir build - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; docker exec build cmake -H/repo -B/build ; fi
- cd build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; mkdir build; cd build; cmake .. -DFORCE_GIT_REVISION="0.0.0-0-g0000000"; fi
- cmake .. -DFORCE_GIT_REVISION="0.0.0-0-g0000000" script:
script: make -j8 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; docker exec build make -j8 ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; make -j8 ; fi