Fix macoOS builds in Travis CI

This commit is contained in:
Jonas Kvinge 2020-08-22 14:02:12 +02:00
parent c5d9a41967
commit d74fc8d1ce
2 changed files with 25 additions and 36 deletions

View File

@ -12,40 +12,34 @@ before_install:
echo $DEPLOY_KEY_ENC | base64 --decode | openssl aes-256-cbc -K $encrypted_83a41ac424a6_key -iv $encrypted_83a41ac424a6_iv -out ~/.ssh/id_rsa -d ; echo $DEPLOY_KEY_ENC | base64 --decode | openssl aes-256-cbc -K $encrypted_83a41ac424a6_key -iv $encrypted_83a41ac424a6_iv -out ~/.ssh/id_rsa -d ;
chmod 600 ~/.ssh/id_rsa ; chmod 600 ~/.ssh/id_rsa ;
fi fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - git fetch --unshallow
docker build -f Dockerfile -t strawberry-build . || travis_terminate 1; - git pull
docker run --name build -itd strawberry-build /bin/bash || travis_terminate 1; - brew update
docker exec build git clone https://github.com/strawberrymusicplayer/strawberry; - travis_wait 120 brew upgrade || echo "Failed"
fi - travis_wait 120 brew upgrade || echo "Failed"
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - brew unlink python@2
git fetch --unshallow || travis_terminate 1; - brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls fftw sqlite chromaprint zlib taglib
git pull || travis_terminate 1; - brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
brew unlink python@2 || travis_terminate 1; - brew install libcdio libmtp
brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls fftw sqlite chromaprint zlib taglib; - brew install create-dmg
brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; - brew cask install sparkle
brew install libcdio libmtp; - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework
brew install create-dmg; - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM
brew cask install sparkle; - export Qt5_DIR=/usr/local/opt/qt5/lib/cmake
sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework; - export Qt5LinguistTools_DIR=/usr/local/opt/qt5/lib/cmake/Qt5LinguistTools
sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM; - export PATH="/usr/local/opt/gettext/bin:$PATH"
export Qt5_DIR=/usr/local/opt/qt5/lib/cmake; - export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig/:/usr/local/opt/zlib/lib/pkgconfig:$PKG_CONFIG_PATH"
export Qt5LinguistTools_DIR=/usr/local/opt/qt5/lib/cmake/Qt5LinguistTools; - ls /usr/local/lib/gstreamer-1.0
export PATH="/usr/local/opt/gettext/bin:$PATH";
export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig/:/usr/local/opt/zlib/lib/pkgconfig:$PKG_CONFIG_PATH";
ls /usr/local/lib/gstreamer-1.0;
fi
before_script: before_script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build cmake -Hstrawberry -Bbuild ; fi - mkdir build
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build; cd build; cmake .. -DUSE_BUNDLE=ON ; fi - cd build
- cmake .. -DUSE_BUNDLE=ON
script: script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build make -C build -j8 ; fi - make -j8
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - make install
make -j8 || travis_terminate 1; - make dmg
make install || travis_terminate 1;
make dmg;
fi
after_success: after_success:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -lh strawberry*.dmg; fi - ls -lh strawberry*.dmg
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC_FOR_BUILD" == "gcc" ]] && [ -f ~/.ssh/id_rsa ]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC_FOR_BUILD" == "gcc" ]] && [ -f ~/.ssh/id_rsa ]; then
if [[ "$TRAVIS_BRANCH" == "master" ]]; then if [[ "$TRAVIS_BRANCH" == "master" ]]; then
rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos; rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos;

View File

@ -1,5 +0,0 @@
from jonaski/opensuse:lp151
run mkdir -p /usr/src/app
workdir /usr/src/app
copy . /usr/src/app