updated travis script for mac
This commit is contained in:
@@ -2,7 +2,8 @@
|
||||
|
||||
# Check if there's been a new commit since this build, and if so don't upload it
|
||||
|
||||
REMOTE=$(curl -s -N https://api.github.com/repos/olive-editor/olive/commits/master | $GREP -Po '(?<=: \")(([a-z0-9])\w+)(?=\")' -m 1)
|
||||
|
||||
REMOTE=$(curl -s -N https://api.github.com/repos/olive-editor/olive/commits/master | grep -Po '(?<=: \")(([a-z0-9])\w+)(?=\")' -m 1)
|
||||
LOCAL=$(git rev-parse HEAD)
|
||||
|
||||
if [ "$REMOTE" == "$LOCAL" ]
|
||||
|
||||
+2
-5
@@ -2,14 +2,11 @@
|
||||
|
||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
|
||||
brew install ffmpeg qt5 python@2 grep
|
||||
export GREP=ggrep
|
||||
export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH"
|
||||
brew install ffmpeg qt5 grep
|
||||
export PATH="/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH"
|
||||
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
|
||||
export GREP=grep
|
||||
|
||||
if [ "$ARCH" == "x86_64" ]; then
|
||||
sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins fuse
|
||||
fi
|
||||
|
||||
@@ -22,7 +22,10 @@ InstallDir "$PROGRAMFILES32\${APP_NAME}"
|
||||
!endif
|
||||
|
||||
!insertmacro MUI_PAGE_WELCOME
|
||||
|
||||
# Try using the LICENSE file from the source root
|
||||
!insertmacro MUI_PAGE_LICENSE LICENSE
|
||||
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
||||
Reference in New Issue
Block a user