Skip to content

Mac autobuild: Update to Xcode 12 #1794

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

Closed
hoffie wants to merge 5 commits into from
Closed

Mac autobuild: Update to Xcode 12 #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69d504c
Mac build: Pin dmgbuild to 1.4.2 as 1.5.0 is broken
hoffie May 31, 2021
51b13da
Mac build: Allow passing extra args to qmake
hoffie May 31, 2021
2e5aae9
Mac autobuild: Update to Xcode 12
hoffie May 31, 2021
b7f3d4e
Update XCode version to 12.4
ann0see Sep 5, 2021
f4b356d
Merge branch 'master' into mac-xcode-12
ann0see Sep 5, 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
10 changes: 6 additions & 4 deletions .github/workflows/autobuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ jobs:
target_os: macos
building_on_os: macos-10.15
cmd1_prebuild: "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.15.2"
cmd2_build: "./autobuild/mac/artifacts/autobuild_mac_2_build.sh sign_if_possible"
# QMAKE_MAC_SDK limits the auto-used to the specified maximum version to ensure compatibility with Qt 5.15.2,
# QMAKE_MACOSX_DEPLOYMENT_TARGET describes the minimum version which we support with this build:
cmd2_build: "env EXTRA_QMAKE_ARGS='QMAKE_MAC_SDK=macosx10.15 QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13' ./autobuild/mac/artifacts/autobuild_mac_2_build.sh sign_if_possible"
cmd3_postbuild: "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh"
uses_codeql: false

Expand Down Expand Up @@ -151,13 +153,13 @@ jobs:
runs-on: ${{ matrix.config.building_on_os }}
steps:

# For Qt5 on Mac, we need to ensure SDK 10.15 is used, and not SDK 11.x
# This is done by selecting Xcode 11.7 instead of the latest default of 12.x
# For Qt5 on Mac, we need to ensure SDK 10.15 is used.
# Xcode 12.0 is the last version which ships SDK 10.15, therefore pin it:
- name: Select Xcode version for Mac
if: ${{ matrix.config.target_os == 'macos' }}
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '11.7'
xcode-version: '12.4.0'

# Checkout code
- name: Checkout code
Expand Down
3 changes: 2 additions & 1 deletion autobuild/mac/artifacts/autobuild_mac_2_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh
cd "${THIS_JAMULUS_PROJECT_PATH}"

echo "Run deploy script..."
export EXTRA_QMAKE_ARGS

# If we have certificate details, then prepare the signing
if [[ "${SIGN}" != "sign_if_possible" ||
Expand All @@ -47,4 +48,4 @@ else
sh "${THIS_JAMULUS_PROJECT_PATH}"/mac/deploy_mac.sh -s "${MACOS_CERTIFICATE_ID}"
# Set up the notarization and staple parts
echo "::set-output name=macos_signed::true"
fi
fi
2 changes: 1 addition & 1 deletion mac/deploy_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ cleanup()
build_app()
{
# Build Jamulus
qmake "${project_path}" -o "${build_path}/Makefile" "CONFIG+=release" ${@:2}
qmake "${project_path}" -o "${build_path}/Makefile" "CONFIG+=release" ${@:2} ${EXTRA_QMAKE_ARGS:-}
local target_name="$(cat "${build_path}/Makefile" | sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p')"
local job_count="$(sysctl -n hw.ncpu)"

Expand Down