diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index d6fb37e932..6131504d9c 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -111,7 +111,7 @@ jobs: - config_name: MacOS (codeQL) target_os: macos building_on_os: macos-10.15 - cmd1_prebuild: "./autobuild/mac/codeQL/autobuild_mac_1_prepare.sh" + cmd1_prebuild: "./autobuild/mac/codeQL/autobuild_mac_1_prepare.sh 5.15.2" cmd2_build: "./autobuild/mac/codeQL/autobuild_mac_2_build.sh" cmd3_postbuild: false uses_codeql: true @@ -119,11 +119,19 @@ jobs: - config_name: MacOS (artifacts) target_os: macos building_on_os: macos-10.15 - cmd1_prebuild: "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh" + cmd1_prebuild: "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.15.2" cmd2_build: "./autobuild/mac/artifacts/autobuild_mac_2_build.sh" cmd3_postbuild: "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh" uses_codeql: false + - config_name: MacOS Legacy (artifacts) + target_os: macos + building_on_os: macos-10.15 + cmd1_prebuild: "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.9.9" + cmd2_build: "./autobuild/mac/artifacts/autobuild_mac_2_build.sh" + cmd3_postbuild: "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh legacy" + uses_codeql: false + - config_name: Windows (artifact+codeQL) target_os: windows building_on_os: windows-latest diff --git a/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh b/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh index 3f59b370a8..48642db6a1 100755 --- a/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh +++ b/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh @@ -2,16 +2,23 @@ # autobuild_1_prepare: set up environment, install Qt & dependencies +if [ "$#" -ne "1" ]; then + echo "need to specify Qt version" + exit 1 +fi + +QT_VER=$1 + ################### ### PROCEDURE ### ################### echo "Install dependencies..." python3 -m pip install aqtinstall -python3 -m aqt install --outputdir /usr/local/opt/qt 5.12.10 mac desktop +python3 -m aqt install --outputdir /usr/local/opt/qt ${QT_VER} mac desktop # add the qt binaries to the path -export -p PATH=/usr/local/opt/qt/5.12.10/clang_64/bin:"${PATH}" +export -p PATH=/usr/local/opt/qt/${QT_VER}/clang_64/bin:"${PATH}" echo "::set-env name=PATH::${PATH}" echo "the path is ${PATH}" diff --git a/autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh b/autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh index 64dd55d690..32f4205e00 100755 --- a/autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh +++ b/autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh @@ -2,6 +2,10 @@ # autobuild_3_copy_files: copy the built files to deploy folder +if [ "$#" -gt 1 ]; then + BUILD_SUFFIX=_$1 + shift +fi #################### ### PARAMETERS ### @@ -23,7 +27,7 @@ echo "" echo "" echo "" -artifact_deploy_filename=jamulus_${jamulus_buildversionstring}_mac.dmg +artifact_deploy_filename=jamulus_${jamulus_buildversionstring}_mac${BUILD_SUFFIX}.dmg echo "Move/Rename the built file to deploy/${artifact_deploy_filename}" mv "${THIS_JAMULUS_PROJECT_PATH}"/deploy/Jamulus-*installer-mac.dmg "${THIS_JAMULUS_PROJECT_PATH}"/deploy/"${artifact_deploy_filename}" diff --git a/autobuild/mac/codeQL/autobuild_mac_1_prepare.sh b/autobuild/mac/codeQL/autobuild_mac_1_prepare.sh index 1872decd24..a12262bb05 100755 --- a/autobuild/mac/codeQL/autobuild_mac_1_prepare.sh +++ b/autobuild/mac/codeQL/autobuild_mac_1_prepare.sh @@ -2,16 +2,23 @@ # autobuild_1_prepare: set up environment, install Qt & dependencies +if [ "$#" -ne "1" ]; then + echo "need to specify Qt version" + exit 1 +fi + +QT_VER=$1 + ################### ### PROCEDURE ### ################### echo "Install dependencies..." python3 -m pip install aqtinstall -python3 -m aqt install --outputdir /usr/local/opt/qt 5.12.10 mac desktop +python3 -m aqt install --outputdir /usr/local/opt/qt ${QT_VER} mac desktop # add the qt binaries to the path -export -p PATH=/usr/local/opt/qt/5.12.10/clang_64/bin:"${PATH}" +export -p PATH=/usr/local/opt/qt/${QT_VER}/clang_64/bin:"${PATH}" echo "::set-env name=PATH::${PATH}" echo "the path is ${PATH}"