summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2025-01-28 09:35:24 +0100
committerAlbin <albin@mullvad.net>2025-01-28 11:54:15 +0100
commit0a10a1ae2315f00a345263a4e9b8698e14cf713a (patch)
treee0979749c5ff33c2ee4d3a615162ff2467742280
parent7adc8ac268b55231744dba721dea72398fb62177 (diff)
downloadmullvadvpn-0a10a1ae2315f00a345263a4e9b8698e14cf713a.tar.xz
mullvadvpn-0a10a1ae2315f00a345263a4e9b8698e14cf713a.zip
Fix missing default infra workflow variable
-rw-r--r--.github/workflows/android-app.yml16
1 files changed, 9 insertions, 7 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index 95383d4ffc..574f756845 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -59,6 +59,9 @@ on:
permissions: {}
+env:
+ E2E_TEST_INFRA_FLAVOR: ${{ github.event.inputs.e2e_tests_infra_flavor || 'stagemole' }}
+
jobs:
prepare:
name: Prepare
@@ -294,7 +297,7 @@ jobs:
- name: Build stagemole app
uses: burrunan/gradle-cache-action@v1
if: >
- (github.event.inputs.e2e_test_repeat != '0' && github.event.inputs.e2e_tests_infra_flavor == 'stagemole') ||
+ (github.event.inputs.e2e_test_repeat != '0' && env.E2E_TEST_INFRA_FLAVOR == 'stagemole') ||
github.event.inputs.run_firebase_tests == 'true'
with:
job-id: jdk17
@@ -496,12 +499,12 @@ jobs:
env:
AUTO_FETCH_TEST_HELPER_APKS: true
TEST_TYPE: e2e
- BILLING_FLAVOR: ${{ github.event.inputs.e2e_tests_infra_flavor == 'prod' && 'oss' || 'play' }}
- INFRA_FLAVOR: ${{ github.event.inputs.e2e_tests_infra_flavor }}
+ BILLING_FLAVOR: ${{ env.E2E_TEST_INFRA_FLAVOR == 'prod' && 'oss' || 'play' }}
+ INFRA_FLAVOR: ${{ env.E2E_TEST_INFRA_FLAVOR }}
PARTNER_AUTH: |-
- ${{ github.event.inputs.e2e_tests_infra_flavor == 'stagemole' && secrets.STAGEMOLE_PARTNER_AUTH || '' }}
+ ${{ env.E2E_TEST_INFRA_FLAVOR == 'stagemole' && secrets.STAGEMOLE_PARTNER_AUTH || '' }}
VALID_TEST_ACCOUNT_NUMBER: |-
- ${{ github.event.inputs.e2e_tests_infra_flavor == 'prod' && secrets.ANDROID_PROD_TEST_ACCOUNT || '' }}
+ ${{ env.E2E_TEST_INFRA_FLAVOR == 'prod' && secrets.ANDROID_PROD_TEST_ACCOUNT || '' }}
INVALID_TEST_ACCOUNT_NUMBER: '0000000000000000'
ENABLE_HIGHLY_RATE_LIMITED_TESTS: ${{ github.event_name == 'schedule' && 'true' || 'false' }}
ENABLE_ACCESS_TO_LOCAL_API_TESTS: true
@@ -511,8 +514,7 @@ jobs:
- name: Upload e2e instrumentation report
uses: actions/upload-artifact@v4
if: >
- always() && matrix.test-repeat != 0 &&
- github.event.inputs.e2e_tests_infra_flavor == 'stagemole'
+ always() && matrix.test-repeat != 0 && env.E2E_TEST_INFRA_FLAVOR == 'stagemole'
with:
name: e2e-instrumentation-report
path: ${{ steps.prepare-report-dir.outputs.report_dir }}