Merge pull request musescore#6573 from musescore/mu3/ci/test0924

[MU3] Testing build release
njvdberg · Sep 27, 2020 · 53e4719 · 53e4719
2 parents 51f002c + 342fe8d
commit 53e4719
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build/ci/macos/setup.sh b/build/ci/macos/setup.sh
@@ -10,12 +10,12 @@ export MACOSX_DEPLOYMENT_TARGET=10.10
 echo -e "universal_target 10.10\nmacosx_deployment_target 10.10\nmacosx_sdk_version 10.10" | sudo tee -a /opt/local/etc/macports/macports.conf
 sudo port install git pkgconfig cmake
 sudo port -s install libsndfile lame portaudio jack
-export QT_SHORT_VERSION=5.15.1
+export QT_SHORT_VERSION=5.9
 export QT_PATH=$HOME/Qt
 export QT_MACOS=$QT_PATH/$QT_SHORT_VERSION/clang_64
 export PATH=$PATH:$QT_MACOS/bin
 echo "::set-env name=PATH::${PATH}"
-wget -nv -O qt5.zip https://s3.amazonaws.com/utils.musescore.org/Qt5151_mac.zip
+wget -nv -O qt5.zip https://s3.amazonaws.com/utils.musescore.org/qt598_mac.zip
 mkdir -p $QT_MACOS
 unzip -qq qt5.zip -d $QT_MACOS
 rm qt5.zip

diff --git a/build/ci/windows/package.bat b/build/ci/windows/package.bat
@@ -26,7 +26,6 @@ IF %RELEASE_CHANNEL% == "" ( SET /p RELEASE_CHANNEL=<%ARTIFACTS_DIR%\env\release
 
 : Check args
 IF %RELEASE_CHANNEL% == "" ( ECHO "error: not set RELEASE_CHANNEL" & GOTO END_ERROR)
-
 IF NOT %TARGET_PROCESSOR_BITS% == 64 (
     IF NOT %TARGET_PROCESSOR_BITS% == 32 (
         ECHO "error: not set TARGET_PROCESSOR_BITS, must be 32 or 64, current TARGET_PROCESSOR_BITS: %TARGET_PROCESSOR_BITS%"
@@ -53,6 +52,7 @@ IF %RELEASE_CHANNEL% == devel   ( SET PACKAGE_TYPE="7z") ELSE (
     GOTO END_ERROR
 ))))
 
+
 SET DO_SIGN=OFF
 IF %PACKAGE_TYPE% == "msi" ( 
     SET DO_SIGN=ON