wrap os name in quotes
This commit is contained in:
@@ -1,14 +1,17 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
|
||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]
|
||||
then
|
||||
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
|
||||
upload.sh Olive*.zip
|
||||
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]
|
||||
then
|
||||
find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
|
||||
# curl --upload-file Olive*.AppImage https://transfer.sh/Olive-git.$(git rev-parse --short HEAD)-$ARCH.AppImage
|
||||
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
|
||||
# only create release for master
|
||||
if [ "$TRAVIS_BRANCH" != "master" ]; then
|
||||
if [ "$TRAVIS_BRANCH" != "master" ]
|
||||
then
|
||||
export TRAVIS_EVENT_TYPE=pull_request
|
||||
fi
|
||||
upload.sh Olive*.AppImage*
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
|
||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
# do nothing
|
||||
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
|
||||
sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
|
||||
sudo apt-get update -qq
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
|
||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
brew install ffmpeg qt5
|
||||
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
if [ "$ARCH" == "x86_64" ]; then sudo apt-get -y install qt59base qt59multimedia libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins fuse; fi
|
||||
if [ "$ARCH" == "i386" ]; then sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 frei0r-plugins:i386 pkg-config:i386 libgl1-mesa-dev:i386 fuse:i386; fi
|
||||
source /opt/qt*/bin/qt*-env.sh
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
|
||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
lrelease olive.pro
|
||||
qmake CONFIG+=release PREFIX=/usr
|
||||
make -j$(nproc)
|
||||
macdeployqt Olive.app
|
||||
zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
|
||||
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
lrelease olive.pro
|
||||
if [ "$ARCH" == "i386" ]; then
|
||||
qmake CONFIG+=release "QMAKE_CFLAGS+=-m32" "QMAKE_CXXFLAGS+=-m32" "QMAKE_LFLAGS+=-m32" PREFIX=/usr -spec linux-g++-32; fi
|
||||
@@ -24,7 +24,7 @@ elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
|
||||
rm Olive*.AppImage
|
||||
wget -c -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-i686.AppImage"
|
||||
chmod a+x appimagetool-i686.AppImage
|
||||
./appimagetool-i686.AppImage 'appdir' -n -g
|
||||
./appimagetool-i686.AppImage "appdir" -n -g
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user