Merge pull request #5620 from m-kuhn/fix-interrepo-build

Fix interrepo android build
opengisch · Sep 7, 2024 · 94bbd18 · 94bbd18 · qfield-fairy · Sep 7, 2024
2 parents 85d7d18 + 75b4db9
commit 94bbd18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -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
@@ -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: |

diff --git a/platform/android/CPackAndroidDeployQt.cmake.in b/platform/android/CPackAndroidDeployQt.cmake.in
@@ -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@"