diff --git a/.appveyor.yml b/.appveyor.yml index 94f6685884..a8169d698e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,7 +13,7 @@ branches: # build cache to preserve files/folders between builds cache: - dependencies.7z - # - qt-5.12.1-msvc.7z # if not using AppVeyor's built-in Qt in before_build.bat + - qt-5.12.3-msvc.7z # if not using AppVeyor's built-in Qt in before_build.bat - C:\Program Files (x86)\Jack - C:\MuseScore\build.release\thirdparty - C:\ccache diff --git a/build/appveyor/before_build.bat b/build/appveyor/before_build.bat index a6dfa867ea..130d8471f1 100644 --- a/build/appveyor/before_build.bat +++ b/build/appveyor/before_build.bat @@ -1,22 +1,22 @@ -:: SET "QTCACHE=qt-5.12.1-msvc.7z" & :: bump version here and .appveyor.yml to trigger cache rebuild when upgrading Qt +SET "QTCACHE=qt-5.12.3-msvc.7z" & :: bump version here and .appveyor.yml to trigger cache rebuild when upgrading Qt :: set platform-dependent variables IF "%PLATFORM%" == "x64" ( - :: SET "QTURL=https://utils.musescore.org.s3.amazonaws.com/qt5120_msvc2017_64.7z" - :: SET "QTDIR=%cd%\qt\msvc2017_64" & :: uncomment to use our Qt - SET "QTDIR=C:\Qt\5.12.4\msvc2017_64" & :: uncomment to use AppVeyor's Qt + SET "QTURL=https://utils.musescore.org.s3.amazonaws.com/qt5123_msvc2017_64.7z" + SET "QTDIR=%cd%\qt\msvc2017_64" & :: uncomment to use our Qt + :: SET "QTDIR=C:\Qt\5.12.4\msvc2017_64" & :: uncomment to use AppVeyor's Qt SET "TARGET_PROCESSOR_BITS=64" SET "TARGET_PROCESSOR_ARCH=x86_64" ) ELSE ( - :: SET "QTURL=https://utils.musescore.org.s3.amazonaws.com/qt5120_msvc2017_32.7z" - :: SET "QTDIR=%cd%\qt\msvc2017" & :: uncomment to use our Qt - SET "QTDIR=C:\Qt\5.12.4\msvc2017" & :: uncomment to use AppVeyor's Qt + SET "QTURL=https://utils.musescore.org.s3.amazonaws.com/qt5123_msvc2017_32.7z" + SET "QTDIR=%cd%\qt\msvc2017" & :: uncomment to use our Qt + :: SET "QTDIR=C:\Qt\5.12.4\msvc2017" & :: uncomment to use AppVeyor's Qt SET "TARGET_PROCESSOR_BITS=32" SET "TARGET_PROCESSOR_ARCH=x86" ) :: Download Qt if necessary -:: IF NOT EXIST "%QTCACHE%" ( START " " /wait "C:\cygwin64\bin\wget.exe" --no-check-certificate "%QTURL%" -O "%QTCACHE%" ) -:: START " " /wait "7z" x -y "%QTCACHE%" "-oqt" & :: extract into `qt` directory +IF NOT EXIST "%QTCACHE%" ( START " " /wait "C:\cygwin64\bin\wget.exe" --no-check-certificate "%QTURL%" -O "%QTCACHE%" ) +START " " /wait "7z" x -y "%QTCACHE%" "-oqt" & :: extract into `qt` directory :: keep full PATH for later SET OLD_PATH=%PATH%