Skip to content
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

Jump to bottom

Build: iOS: Use Qt6 and bump build environment #3065

Closed
wants to merge 9 commits into from
Closed

Build: iOS: Use Qt6 and bump build environment #3065

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cec7148
Build: iOS: Use Qt6 and bump build environment
hoffie Oct 31, 2022
f097dc4
iOS: Fix some Qt6 related UI bugs
ann0see May 13, 2023
3b6d500
Pass qmake path by parameter and upgrade macOS
ann0see May 24, 2023
3e96f6b
Fix wrong parameter
ann0see May 24, 2023
7865882
Yet another fix
ann0see May 24, 2023
f4c02de
Remove linker flags
ann0see May 24, 2023
6e721f5
Use alternative fix for entrypoint bug
ann0see May 24, 2023
f211c66
Revert "Use alternative fix for entrypoint bug"
ann0see May 24, 2023
25a0bc0
Revert "Remove linker flags"
ann0see May 24, 2023
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
2 changes: 1 addition & 1 deletion .github/autobuild/ios.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ setup() {
build_app_as_ipa() {
# Add the Qt binaries to the PATH:
export PATH="${QT_DIR}/${QT_VERSION}/ios/bin:${PATH}"
./ios/deploy_ios.sh
./ios/deploy_ios.sh -q "${QT_DIR}/${QT_VERSION}/ios/bin/qmake"
}

pass_artifact_to_job() {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/autobuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ jobs:

- config_name: iOS (artifacts)
target_os: ios
building_on_os: macos-12
building_on_os: macos-13
base_command: QT_VERSION=6.4.3 ./.github/autobuild/ios.sh
# Build failed with CodeQL enabled when last tested 03/2022 (#2490).
# There are no hints that iOS is supposed to be supported by CodeQL.
Expand Down
23 changes: 22 additions & 1 deletion ios/deploy_ios.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
#!/bin/bash
set -eu -o pipefail


qmake_path=""

while getopts 'hs:' flag; do
case "${flag}" in
m)
qmake_path=$OPTARG
if [[ -z "$qmake_path" ]]; then
echo "Please add the path to the qmake binary: -m \"</path/to/ios/qmake/binary>\""
fi
;;
h)
echo "Usage: -m </path/to/ios/qmake/binary>"
exit 0
;;
*)
exit 1
;;
esac
done

## Builds an ipa file for iOS. Should be run from the repo-root

# Create Xcode file and build
qmake -spec macx-xcode Jamulus.pro
eval "${qmake_path} Jamulus.pro"
Copy link
Member Author

Choose a reason for hiding this comment

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

I don't like eval here

/usr/bin/xcodebuild -project Jamulus.xcodeproj -scheme Jamulus -configuration Release clean archive -archivePath "build/Jamulus.xcarchive" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO CODE_SIGN_ENTITLEMENTS=""

# Generate ipa by copying the .app file from the xcarchive directory
Expand Down