android: create and sign separate bundle ID for PRs #19614
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Jenkins BuildsClick to see older builds (380)
|
siddarthkay
force-pushed
the
fix-android-signing
branch
14 times, most recently
from
174de75 to
0b1d305
Compare
siddarthkay
force-pushed
the
fix-android-signing
branch
2 times, most recently
from
1d44a8b to
f5fda2d
Compare
siddarthkay
changed the title
jrainville
approved these changes
Dec 22, 2025
Member
jrainville
left a comment
jrainville
left a comment
There was a problem hiding this comment.
I guess we'll need to cherry-pick this to the release/2.36.x branch?
siddarthkay
force-pushed
the
fix-android-signing
branch
2 times, most recently
from
922b490 to
c94940e
Compare
siddarthkay
force-pushed
the
fix-android-signing
branch
from
c94940e to
b708129
Compare
yakimant
approved these changes
Dec 25, 2025
Member
yakimant
left a comment
yakimant
left a comment
There was a problem hiding this comment.
It would be nice to make fever places deciding on:
- variant: pr, release
- app name: Status, StatusPR
- bunde id: app.status.mobile.pr, app.status.mobile
Too many places cause confusion:
- Where exactly it is controlled?
- Where do I need to change so it is changed in the build?
ci/Jenkinsfile.android
Outdated
| PACKAGE_TYPE = "${params.PACKAGE_TYPE != 'auto' ? params.PACKAGE_TYPE : (isReleaseBranch ? 'aab' : 'apk')}" | ||
| /* BUILD_VARIANT controls package name and signing: pr = app.status.mobile.pr, release = app.status.mobile */ | ||
| BUILD_VARIANT = "${utils.isReleaseBuild() ? 'release' : 'pr'}" | ||
| STATUS_ANDROID_APP_NAME = "${utils.isReleaseBuild() ? 'Status' : 'StatusPR'}" |
Member
There was a problem hiding this comment.
We have this logic in multiple places:
- here
- build.gradle
- buildApp.sh
- Status.pro
Can we reduce it?
| androidBuildToolsVersion=35.0.0 | ||
| androidCompileSdkVersion=android-35 | ||
| androidNdkVersion=27.2.12479018 | ||
| qtAndroidDir=/opt/qt/6.9.2/android_arm64_v8a/src/android/java |
Member
There was a problem hiding this comment.
CI I guess? Will it harm on dev machinse if path is different?
Contributor
Author
There was a problem hiding this comment.
Hmm good question, this attribute is mostly CI only, I need to verify.
Contributor
Author
There was a problem hiding this comment.
Added QT_ANDROID_DIR env var in build.gradle to override this, if some dev has different path
siddarthkay
force-pushed
the
fix-android-signing
branch
4 times, most recently
from
94e4cb4 to
95e90f8
Compare
siddarthkay
force-pushed
the
fix-android-signing
branch
2 times, most recently
from
a2aa246 to
2125057
Compare
jakubgs
requested changes
Jan 8, 2026
- brings in status-jenkins-lib@v1.9.33 - use gradle build build types for PR and Release. - signing config moved to gradle - simplify build App script
siddarthkay
force-pushed
the
fix-android-signing
branch
from
5c94338 to
9008c0b
Compare
jakubgs
approved these changes
Jan 9, 2026
| 'iOS/aarch64', jenkins.Build('status-app/systems/ios/aarch64/package') | ||
| ) | ||
| } } } | ||
| stage('Android/arm64') { steps { script { |
Member
There was a problem hiding this comment.
Those should be aarch64 too, but we can fix that later.
mobile/scripts/buildApp.sh
Outdated
Comment on lines
61
to
83
| # Build based on BUILD_TYPE: apk, aab, or apk-aab | ||
| case "$BUILD_TYPE" in | ||
| apk-aab) | ||
| gradle assembleRelease bundleRelease --no-daemon | ||
| [[ ! -f "$APK_OUT" ]] && { echo "Error: $APK_OUT not found"; exit 1; } | ||
| [[ ! -f "$AAB_OUT" ]] && { echo "Error: $AAB_OUT not found"; exit 1; } | ||
| cp "$APK_OUT" "$BIN_DIR/${OUTPUT_NAME}.apk" | ||
| cp "$AAB_OUT" "$BIN_DIR/${OUTPUT_NAME}.aab" | ||
| echo "Build succeeded: $BIN_DIR/${OUTPUT_NAME}.apk and $BIN_DIR/${OUTPUT_NAME}.aab" | ||
| ;; | ||
| aab) | ||
| gradle bundleRelease --no-daemon | ||
| [[ ! -f "$AAB_OUT" ]] && { echo "Error: $AAB_OUT not found"; exit 1; } | ||
| cp "$AAB_OUT" "$BIN_DIR/${OUTPUT_NAME}.aab" | ||
| echo "Build succeeded: $BIN_DIR/${OUTPUT_NAME}.aab" | ||
| ;; | ||
| *) | ||
| gradle assembleRelease --no-daemon | ||
| [[ ! -f "$APK_OUT" ]] && { echo "Error: $APK_OUT not found"; exit 1; } | ||
| cp "$APK_OUT" "$BIN_DIR/${OUTPUT_NAME}.apk" | ||
| echo "Build succeeded: $BIN_DIR/${OUTPUT_NAME}.apk" | ||
| ;; | ||
| esac |
Member
There was a problem hiding this comment.
This whole thing is ugly as all hell, we're repating the same stuff 3 times simple because we want to call different targets sometimes. Why did we invent a whole new magical BUILD_TYPE when we could just have a dead simple GRADLE_TARGETS and simplify all of this to a single case?
Comment on lines
117
to
126
| .PHONY: apk-aab | ||
| ifeq ($(OS),android) | ||
| apk-aab: | ||
| @$(MAKE) PACKAGE_TYPE=apk-aab $(BIN_PATH)/Status.apk | ||
| @echo "✓ APK and AAB built successfully" | ||
| else | ||
| apk-aab: | ||
| @echo "Error: apk-aab target is only available for Android" | ||
| @exit 1 | ||
| endif |
Member
There was a problem hiding this comment.
Why do we put ifeq OUTSIDE of the targets?
Suggested change
| .PHONY: apk-aab | |
| ifeq ($(OS),android) | |
| apk-aab: | |
| @$(MAKE) PACKAGE_TYPE=apk-aab $(BIN_PATH)/Status.apk | |
| @echo "✓ APK and AAB built successfully" | |
| else | |
| apk-aab: | |
| @echo "Error: apk-aab target is only available for Android" | |
| @exit 1 | |
| endif | |
| .PHONY: apk-aab | |
| apk-aab: | |
| ifeq ($(OS),android) | |
| @$(MAKE) PACKAGE_TYPE=apk-aab $(BIN_PATH)/Status.apk | |
| @echo "✓ APK and AAB built successfully" | |
| else | |
| $(error "Error: apk-aab target is only available for Android") | |
| endif |
Same applies for all other targets.
| library 'status-jenkins-lib@v1.9.34' | ||
|
|
||
| /* Options section can't access functions in objects. */ | ||
| def isPRBuild = utils.isPRBuild() |
ci/Jenkinsfile.android
Outdated
| STATUS_BINARY = "${WORKSPACE}/mobile/bin/android/qt6/Status.${env.PACKAGE_TYPE}" | ||
| /* override package type if set, otherwise auto-select based on branch | ||
| * release branches build both APK and AAB */ | ||
| PACKAGE_TYPE = "${params.PACKAGE_TYPE != 'auto' ? params.PACKAGE_TYPE : (isReleaseBranch ? 'apk-aab' : 'apk')}" |
Contributor
Author
There was a problem hiding this comment.
auto is a default choice in params above in the file.
ci/Jenkinsfile.android
Outdated
| /* override package type if set, otherwise auto-select based on branch | ||
| * release branches build both APK and AAB */ | ||
| PACKAGE_TYPE = "${params.PACKAGE_TYPE != 'auto' ? params.PACKAGE_TYPE : (isReleaseBranch ? 'apk-aab' : 'apk')}" | ||
| BUILD_AAB = "${env.PACKAGE_TYPE == 'apk-aab'}" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix-android-signingbranch in status-jenkins-lib