diff --git a/.travis.yml b/.travis.yml index de99008e..b300a3b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,22 +11,23 @@ jobs: os: osx osx_image: xcode12.2 - addons: - homebrew: - packages: - - qt5 +# addons: +# homebrew: +# packages: +# - qt5 # update: true script: + - if [ ! -f $HOME/Qt/5.14.2/clang_64/bin/qmake ]; then bash deploy/install-qt.sh --version 5.14.2 --toolchain clang_64 qtbase; fi - bash deploy/build_macos.sh -before_cache: - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi - # Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then find /usr/local/Homebrew \! -regex ".+\.git.+" -delete; fi +#before_cache: +# - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi +# # Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build +# - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then find /usr/local/Homebrew \! -regex ".+\.git.+" -delete; fi cache: - apt: true directories: - - $HOME/Library/Caches/Homebrew - - /usr/local/Cellar/qt \ No newline at end of file + - $HOME/Qt +# - $HOME/Library/Caches/Homebrew +# - /usr/local/Cellar/qt \ No newline at end of file diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 1591007a..664b811c 100644 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -29,17 +29,19 @@ QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash TARGET_FILENAME=$PROJECT_DIR/$APP_NAME.dmg # Seacrh Qt -echo "Brew Qt version" -brew --prefix qt +echo "Brew Qt version $(brew --prefix qt)" -if [ -f $(brew --prefix qt)/clang_64/bin/qmake ]; then QT_BIN_DIR=$(brew --prefix qt)/clang_64/bin; -else QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin; fi + +#if [ -f $(brew --prefix qt)/clang_64/bin/qmake ]; then QT_BIN_DIR=$(brew --prefix qt)/clang_64/bin; +#else QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin; fi + +QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin #QIF_BIN_DIR=$HOME/Qt/Tools/QtInstallerFramework/4.0/bin QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin echo "Using Qt in $QT_BIN_DIR" -echo "Using Qt in $QIF_BIN_DIR" +echo "Using QIF in $QIF_BIN_DIR" ls -al $QT_BIN_DIR/../../..