oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another travis script change for osx

Browse Source
This commit is contained in:
itsmattkc
2019-03-09 08:49:22 +11:00
parent 8710c6b231
commit 7212d0e7d8
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis/after_success.sh
+8 -3
View File
@@ -2,15 +2,20 @@
# Check if there's been a new commit since this build, and if so don't upload it # Check if there's been a new commit since this build, and if so don't upload it
GREP_PATH=grep
REMOTE=$(curl -s -N https://api.github.com/repos/olive-editor/olive/commits/master | grep -Po '(?<=: \")(([a-z0-9])\w+)(?=\")' -m 1) if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
GREP_PATH=ggrep
fi
REMOTE=$(curl -s -N https://api.github.com/repos/olive-editor/olive/commits/master | $GREP_PATH -Po '(?<=: \")(([a-z0-9])\w+)(?=\")' -m 1)
LOCAL=$(git rev-parse HEAD) LOCAL=$(git rev-parse HEAD)
if [ "$REMOTE" == "$LOCAL" ] if [ "$REMOTE" == "$LOCAL" ]
then then
echo "[INFO] This commit is still current. Uploading..." echo "[INFO] Still current. Uploading..."
else else
echo "[INFO] This commit is no longer current. $REMOTE vs $LOCAL - aborting upload." echo "[INFO] No longer current. $REMOTE vs $LOCAL - aborting upload."
exit 0 exit 0
fi fi
.travis/install.sh
+1 -1
View File
@@ -3,7 +3,7 @@
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew install ffmpeg qt5 grep 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" export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH"
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then