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

Fix interrepo android build #5620

Merged
merged 1 commit into from
Sep 7, 2024
Merged

Fix interrepo android build #5620

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
5 changes: 3 additions & 2 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ jobs:
qt_arch: 'android_x86'
all_files_access: 'ON'
artifact_name: 'android-x86'
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

steps:
- name: 🐣 Checkout
Expand Down Expand Up @@ -209,9 +211,8 @@ jobs:

- name: 📮 Upload debug symbols
# if: release or labeled PR
if: ${{ matrix.all_files_access == 'OFF' }}
if: ${{ matrix.all_files_access == 'OFF' && env.SENTRY_AUTH_TOKEN != '' }}
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG_SLUG: opengisch
SENTRY_PROJECT_SLUG: qfield
run: |
Expand Down
6 changes: 3 additions & 3 deletions platform/android/CPackAndroidDeployQt.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if(DEFINED ENV{KEYNAME}
AND DEFINED ENV{KEYPASS}
AND DEFINED ENV{STOREPASS})
if(NOT "$ENV{KEYNAME}" STREQUAL ""
AND NOT "$ENV{KEYPASS}" STREQUAL ""
AND NOT "$ENV{STOREPASS}" STREQUAL "")
execute_process(
COMMAND
"@ANDROIDDEPLOYQT_EXECUTABLE@"
Expand Down
Loading