Skip to content

Commit 8cee07d

Browse files
committed
Fix 3572: macos-15 runner does not support older than Qt 6.9.1
1 parent 134f966 commit 8cee07d

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

.github/workflows/autobuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,12 @@ jobs:
250250
- config_name: iOS (artifacts)
251251
target_os: ios
252252
building_on_os: macos-15
253-
base_command: QT_VERSION=6.7.3 ./.github/autobuild/ios.sh
253+
base_command: QT_VERSION=6.9.1 ./.github/autobuild/ios.sh
254254
# Build failed with CodeQL enabled when last tested 03/2022 (#2490).
255255
# There are no hints that iOS is supposed to be supported by CodeQL.
256256
# Therefore, disable it:
257257
run_codeql: false
258-
xcode_version: 16.2.0
258+
xcode_version: 16.3.0
259259

260260
- config_name: Windows (artifact+codeQL)
261261
target_os: windows

ios/deploy_ios.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,18 @@ set -eu -o pipefail
55

66
# Create Xcode file and build
77
qmake -spec macx-xcode Jamulus.pro
8-
/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=""
8+
9+
# Workaround: Qt is built for iOS 18.2 but Xcode 16.2.0 only has iOS 18.1 SDK
10+
# Replace 18.2 references with 18.1 in generated project files
11+
echo "Patching iOS SDK version references from 18.2 to 18.1..."
12+
find Jamulus.xcodeproj -type f \( -name "*.pbxproj" -o -name "*.storyboard" \) | while read file; do
13+
if grep -q "18\.[2-9]" "$file" 2>/dev/null; then
14+
echo " Patching: $file"
15+
sed -i '' 's/18\.[2-9]/18.1/g' "$file"
16+
fi
17+
done
18+
19+
/usr/bin/xcodebuild -project Jamulus.xcodeproj -scheme Jamulus -configuration Release -sdk iphoneos clean archive -archivePath "build/Jamulus.xcarchive" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO CODE_SIGN_ENTITLEMENTS=""
920

1021
# Generate ipa by copying the .app file from the xcarchive directory
1122
mkdir build/Payload

0 commit comments

Comments
 (0)