Skip to content

feat: Use unified naming convention for iOS artifacts. #187

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
iphydf merged 1 commit into from
Feb 10, 2026
Merged

feat: Use unified naming convention for iOS artifacts. #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions .github/workflows/deploy-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
name: Build
strategy:
matrix:
arch: [arm64, x86_64, arm64-iphonesimulator]
arch: [ios-arm64, iphonesimulator-arm64, iphonesimulator-x86_64]
ios: ["15.0"]
exclude:
- arch: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'packaging') && 'x86_64' }}
- arch: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'packaging') && 'arm64-iphonesimulator' }}
- arch: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'packaging') && 'iphonesimulator-x86_64' }}
- arch: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'packaging') && 'iphonesimulator-arm64' }}
runs-on: macos-14
permissions:
contents: write
Expand Down Expand Up @@ -67,13 +67,7 @@ jobs:
echo "artifact=$ARTIFACT" >>$GITHUB_OUTPUT
echo "artifact-ref=$PROJECT_NAME-${{ github.sha }}-ios-${{ matrix.ios }}-${{ matrix.arch }}" >>$GITHUB_OUTPUT

if [ "${{ matrix.arch }}" = "x86_64" ]; then
echo "qt_arch=iphonesimulator-x86_64" >>$GITHUB_OUTPUT
elif [ "${{ matrix.arch }}" = "arm64-iphonesimulator" ]; then
echo "qt_arch=iphonesimulator-arm64" >>$GITHUB_OUTPUT
else
echo "qt_arch=ios-arm64" >>$GITHUB_OUTPUT
fi
echo "qt_arch=${{ matrix.arch }}" >>$GITHUB_OUTPUT
- name: Download Qt
if: inputs.need-qt
run: |
Expand Down
15 changes: 11 additions & 4 deletions platform/ios/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,20 @@ if [ -z "${PROJECT_NAME+x}" ]; then
exit 1
fi

if [[ "$IOS_ARCH" == *"iphonesimulator"* ]] || [[ "$IOS_ARCH" == "x86_64" ]]; then
if [[ "$IOS_ARCH" == "iphonesimulator-"* ]]; then
IOS_PLATFORM="iphonesimulator"
CMAKE_ARCH="${IOS_ARCH#iphonesimulator-}"
elif [[ "$IOS_ARCH" == "ios-"* ]]; then
IOS_PLATFORM="iphoneos"
CMAKE_ARCH="${IOS_ARCH#ios-}"
else
# Fallback for simple architecture strings
CMAKE_ARCH="$IOS_ARCH"
if [[ "$IOS_ARCH" == "x86_64" ]]; then
IOS_PLATFORM="iphonesimulator"
fi
fi

# Extract the base architecture (e.g., "arm64" from "arm64-iphonesimulator")
CMAKE_ARCH="${IOS_ARCH%-iphonesimulator}"

readonly BIN_NAME="$PROJECT_NAME-$IOS_ARCH-$IOS_VERSION.ipa"
CMAKE="$DEP_PREFIX/qt/bin/qt-cmake"
PREFIX_PATH="$DEP_PREFIX"
Expand Down
Loading