From 2ef338f0c0952e25cfb073073a90fe17c9601766 Mon Sep 17 00:00:00 2001 From: William Rankin Date: Mon, 14 Sep 2020 17:03:39 +1000 Subject: [PATCH 1/2] Prefer curl on OSX wget is not available by default on OSX --- .travis/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/script.sh b/.travis/script.sh index b4cb03e76..a7fefdccb 100644 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -26,7 +26,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then macdeployqt $BUNDLE_NAME # Fix other deps that macdeployqt missed - wget -c -nv https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py + curl -sLOC - https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/ # Fix deps on crash handler From 030fceba35ebf17c4ee4af2c8592cb4f4df26e95 Mon Sep 17 00:00:00 2001 From: William Rankin Date: Mon, 14 Sep 2020 19:43:23 +1000 Subject: [PATCH 2/2] Update .travis/script.sh Co-authored-by: Simran --- .travis/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/script.sh b/.travis/script.sh index a7fefdccb..4a7a7fa2c 100644 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -26,7 +26,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then macdeployqt $BUNDLE_NAME # Fix other deps that macdeployqt missed - curl -sLOC - https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py + curl -fLOSs --retry 3 https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/ # Fix deps on crash handler