travis macosx: fix Qt install, no cache...

This commit is contained in:
lasconic 2016-06-22 17:59:07 +02:00
parent 49ca671e92
commit de01a4ed93
2 changed files with 6 additions and 5 deletions

View file

@ -101,9 +101,9 @@ matrix:
- env: "JOB=MacOSX"
os: osx
osx_image: xcode7.3
cache:
directories:
- /usr/local/Cellar
#cache:
# directories:
# - /usr/local/Cellar
before_install:
- openssl aes-256-cbc -K $encrypted_99b076488ab1_key -iv $encrypted_99b076488ab1_iv -in build/travis/resources/osuosl_nighlies_rsa.enc -out build/travis/resources/osuosl_nighlies_rsa -d
- source build/travis/job_macos/before_install.sh

View file

@ -39,11 +39,12 @@ if [[ "$QMAKE_VERSION" != "${QT_LONG_VERSION}" ]]; then
echo "Downloading Qt"
wget -c --no-check-certificate -nv https://download.qt.io/archive/qt/${QT_SHORT_VERSION}/${QT_LONG_VERSION}/${QT_INSTALLER_FILENAME}
hdiutil mount ${QT_INSTALLER_FILENAME}
QT_INSTALLER_EXE=/Volumes/${QT_INSTALLER_ROOT}/${QT_INSTALLER_ROOT}.app/Contents/MacOS/${QT_INSTALLER_ROOT}
cp /Volumes/${QT_INSTALLER_ROOT}/${QT_INSTALLER_ROOT}.app $HOME/${QT_INSTALLER_ROOT}.app
QT_INSTALLER_EXE=$HOME/${QT_INSTALLER_ROOT}.app/Contents/MacOS/${QT_INSTALLER_ROOT}
echo "Installing Qt"
./build/travis/job_macos/extract-qt-installer $QT_INSTALLER_EXE $QT_PATH
rm $HOME/${QT_INSTALLER_ROOT}.app
else
echo "Qt ${QT_LONG_VERSION} already installed"
fi