updated version name
This commit is contained in:
@@ -13,6 +13,8 @@ matrix:
|
||||
sudo: require
|
||||
dist: trusty
|
||||
- os: osx
|
||||
- os: windows
|
||||
env: ARCH=x86_64
|
||||
|
||||
before_install:
|
||||
- source ./.travis/before_install.sh
|
||||
|
||||
@@ -1,18 +1,29 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]
|
||||
then
|
||||
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
|
||||
# retrieve upload tool
|
||||
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
|
||||
|
||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
|
||||
# upload final package
|
||||
bash 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
|
||||
export TRAVIS_EVENT_TYPE=pull_request
|
||||
fi
|
||||
|
||||
# upload final package
|
||||
bash upload.sh Olive*.AppImage*
|
||||
|
||||
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
|
||||
|
||||
# upload final package
|
||||
bash upload.sh Olive*.zip
|
||||
|
||||
fi
|
||||
@@ -4,9 +4,17 @@
|
||||
#then
|
||||
# do nothing
|
||||
#elif [[ "$TRAVIS_OS_NAME" == "linux" ]]
|
||||
if [[ "$TRAVIS_OS_NAME" == "linux" ]]
|
||||
then
|
||||
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
|
||||
# install apt repos necessary for Olive
|
||||
sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
|
||||
sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
|
||||
sudo apt-get update -qq
|
||||
|
||||
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
|
||||
|
||||
# install msys2 for mingw package installation
|
||||
# (chocolatey is seemingly missing a recent version of Qt)
|
||||
choco install msys2
|
||||
|
||||
fi
|
||||
@@ -7,5 +7,10 @@ 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
|
||||
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
|
||||
#/c/msys64/usr/bin/bash -l -c "pacman -Syu --noconfirm"
|
||||
|
||||
# install build tools
|
||||
/c/msys64/usr/bin/bash -l -c "pacman -S --noconfirm mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-qt5"
|
||||
fi
|
||||
|
||||
|
||||
@@ -65,4 +65,11 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
chmod a+x appimagetool-i686.AppImage
|
||||
./appimagetool-i686.AppImage "appdir" -n -g
|
||||
fi
|
||||
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
|
||||
/c/msys64/mingw64/bin/qmake CONFIG+=release
|
||||
/c/msys64/mingw64/bin/mingw32-make -f Makefile.Debug
|
||||
mkdir olive-editor
|
||||
mv olive-editor.exe olive-editor/
|
||||
/c/msys64/mingw64/bin/windeployqt olive-editor/olive-editor.exe
|
||||
7z a Olive-$(git rev-parse --short HEAD)-w64p.zip olive-editor
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user