MacOS CI improvement (#214)

* travis ci osx: simpler lib path

* Remove unnecessary sudo
This commit is contained in:
Martin Delille 2019-07-17 21:10:17 +02:00 committed by Jonas Kvinge
parent 4d4748a0a8
commit 7663c5e149
1 changed files with 4 additions and 4 deletions

View File

@ -30,9 +30,9 @@ before_install:
brew install chromaprint;
brew install libcdio libmtp libimobiledevice libplist;
export Qt5_DIR=/usr/local/opt/qt5/lib/cmake;
export Qt5LinguistTools_DIR=/usr/local/Cellar/qt/$(ls /usr/local/Cellar/qt | head -n1)/lib/cmake/Qt5LinguistTools;
export Qt5LinguistTools_DIR=/usr/local/opt/qt5/lib/cmake/Qt5LinguistTools;
export PATH="/usr/local/opt/gettext/bin:$PATH";
export PKG_CONFIG_PATH=/usr/local/Cellar/libffi/$(ls /usr/local/Cellar/libffi | head -n1)/lib/pkgconfig/:$PKG_CONFIG_PATH;
export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig/:$PKG_CONFIG_PATH;
ls /usr/local/lib/gstreamer-1.0;
fi
before_script:
@ -42,8 +42,8 @@ script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build make -C build -j8 ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
make -j8 || travis_terminate 1;
sudo make install || travis_terminate 1;
sudo ../dist/macos/macdeploy.py strawberry.app || travis_terminate 1;
make install || travis_terminate 1;
../dist/macos/macdeploy.py strawberry.app || travis_terminate 1;
../dist/macos/create-dmg.sh strawberry.app;
fi
after_success: