Skip to content

Mac current and legacy #1768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
softins merged 3 commits into from
May 28, 2021
Merged

Mac current and legacy #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18be717
Require Qt version to be passed as script argument
softins May 27, 2021
9bb2769
Allow build suffix to be passed to dmg creation script
softins May 27, 2021
2daeaf4
Build Mac release for both current and legacy versions
softins May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/autobuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,27 @@ 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

- 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
Expand Down
11 changes: 9 additions & 2 deletions autobuild/mac/artifacts/autobuild_mac_1_prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

6 changes: 5 additions & 1 deletion autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
Expand All @@ -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
Copy link
Copy Markdown
Member

@ann0see ann0see May 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also needs to be specified on the website (new variable and button on the macOS page).

Copy link
Copy Markdown
Member

@ann0see ann0see May 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See: jamulussoftware/jamuluswebsite#490

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}"

Expand Down
11 changes: 9 additions & 2 deletions autobuild/mac/codeQL/autobuild_mac_1_prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"