Merge pull request #1056 from pokamest/master

TravisCI build fix for MacOS
mooltipass · Jun 17, 2022 · 52b3636 · 52b3636
2 parents 7261dc3 + 38f2fdb
commit 52b3636
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/scripts/ci/osx/after_success.sh b/scripts/ci/osx/after_success.sh
@@ -17,7 +17,7 @@ if [ "$(git rev-list -n 1 $VERSION)" != "$(git rev-parse HEAD)"  ]; then
     exit 0
 fi
 
-QTDIR="/usr/local/opt/qt6"
+QTDIR="/Users/travis/Qt/6.2.4/macos"
 APP=Moolticute
 # this directory name will also be shown in the title when the DMG is mounted
 TEMPDIR=build/$APP
@@ -53,8 +53,8 @@ fi
 
 #Call fix to change all rpath
 wget_retry https://raw.githubusercontent.com/mooltipass/macdeployqtfix/master/macdeployqtfix.py
-python macdeployqtfix.py build/$APP.app/Contents/MacOS/moolticute /usr/local/Cellar/qt6/6.*/
-python macdeployqtfix.py build/$APP.app/Contents/MacOS/moolticuted /usr/local/Cellar/qt6/6.*/
+python macdeployqtfix.py build/$APP.app/Contents/MacOS/moolticute /Users/travis/Qt/6.2.4/macos/*
+python macdeployqtfix.py build/$APP.app/Contents/MacOS/moolticuted /Users/travis/Qt/6.2.4/macos/*
 
 #setup keychain
 KEYCHAIN="travis.keychain"

diff --git a/scripts/ci/osx/install.sh b/scripts/ci/osx/install.sh
@@ -3,7 +3,7 @@ set -ev
 
 echo "install.sh"
 
-brew update > /dev/null
-brew upgrade wget
-brew install qt6 jq lftp python3
+brew install jq lftp
+pip3 install aqtinstall
+aqt install-qt mac desktop 6.2.4 clang_64 -m all -O /Users/travis/Qt
 networksetup -setv6off Ethernet
diff --git a/scripts/ci/osx/script.sh b/scripts/ci/osx/script.sh
@@ -7,7 +7,7 @@ source $SCRIPTDIR/../funcs.sh
 mkdir build
 pushd build
 
-QTDIR="/usr/local/opt/qt6"
+QTDIR="/Users/travis/Qt/6.2.4/macos"
 PATH="$QTDIR/bin:$PATH"
 LDFLAGS=-L$QTDIR/lib
 CPPFLAGS=-I$QTDIR/include