Merge branch 'develop' into feature/cris/malicious-site-protection/us…

…er-setting
duckduckgo · Feb 4, 2025 · 251660f · 251660f
2 parents 66e165c + 397271f
commit 251660f
Show file tree

Hide file tree

Showing 115 changed files with 3,599 additions and 2,507 deletions.
diff --git a/.github/workflows/ads-end-to-end.yml b/.github/workflows/ads-end-to-end.yml
@@ -56,11 +56,12 @@ jobs:
 
       - name: ADS Preview Flows
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: androidDesignSystem_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro

diff --git a/.github/workflows/build-ad-hoc.yml b/.github/workflows/build-ad-hoc.yml
@@ -64,6 +64,8 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Assemble APK
+        env:
+          MALICIOUS_SITE_PROTECTION_AUTH_TOKEN: ${{ secrets.MALICIOUS_SITE_PROTECTION_AUTH_TOKEN }}
         run: ./gradlew assemble${{github.event.inputs.build-variant}} -Pforce-default-variant
 
       - name: Move APK to new folder

diff --git a/.github/workflows/build-debug-apk.yaml b/.github/workflows/build-debug-apk.yaml
@@ -38,6 +38,8 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Assemble the project
+        env:
+          MALICIOUS_SITE_PROTECTION_AUTH_TOKEN: ${{ secrets.MALICIOUS_SITE_PROTECTION_AUTH_TOKEN }}
         run: ./gradlew assembleInternalDebug -Pforce-default-variant
 
       - name: Obtain debug apk

diff --git a/.github/workflows/build-fdroid-apk.yml b/.github/workflows/build-fdroid-apk.yml
@@ -37,6 +37,8 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Assemble F-Droid release apk
+        env:
+          MALICIOUS_SITE_PROTECTION_AUTH_TOKEN: ${{ secrets.MALICIOUS_SITE_PROTECTION_AUTH_TOKEN }}
         run: ./gradlew assembleFdroidRelease
 
       - name: Create Asana task when workflow failed on push to develop

diff --git a/.github/workflows/custom-tabs-nightly.yml b/.github/workflows/custom-tabs-nightly.yml
@@ -56,11 +56,12 @@ jobs:
 
       - name: Custom Tabs Flows
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: customTabs_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro

diff --git a/.github/workflows/e2e-nightly-autofill.yml b/.github/workflows/e2e-nightly-autofill.yml
@@ -56,11 +56,12 @@ jobs:
 
       - name: Autofill Critical Path E2E Flows
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: autofill_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro

diff --git a/.github/workflows/end-to-end-robintest.yml b/.github/workflows/end-to-end-robintest.yml
@@ -56,11 +56,12 @@ jobs:
 
       - name: Ad click detection flows
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: adClickTest_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro
@@ -69,11 +70,12 @@ jobs:
       - name: Privacy Tests
         if: always()
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: privacyTest_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro
@@ -82,11 +84,12 @@ jobs:
       - name: Security Tests
         if: always()
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: securityTest_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro
@@ -95,11 +98,12 @@ jobs:
       - name: Release Tests
         if: always()
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: releaseTest_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro
@@ -108,11 +112,12 @@ jobs:
       - name: Notifications permissions Android 13+
         if: always()
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: notificationPermissionTest_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 33
           workspace: .maestro/notifications_permissions_android13_plus

diff --git a/.github/workflows/privacy-dashboard-end-to-end.yml b/.github/workflows/privacy-dashboard-end-to-end.yml
@@ -59,11 +59,12 @@ jobs:
 
       - name: Ad click detection flows
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: privacyDashboard_adClickTest_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro
@@ -72,11 +73,12 @@ jobs:
       - name: Privacy Tests
         if: always()
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: privacyDashboard_privacyTest_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           workspace: .maestro
           include-tags: privacyTest
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
@@ -103,6 +103,8 @@ jobs:
         env:
           NETP_DEBUG_SERVER_TOKEN: ${{ secrets.NETP_DEBUG_SERVER_TOKEN }}
         if: steps.check_for_changes.outputs.has_changes == 'true'
+        env:
+          MALICIOUS_SITE_PROTECTION_AUTH_TOKEN: ${{ secrets.MALICIOUS_SITE_PROTECTION_AUTH_TOKEN }}
         run: gradle bundleInternalRelease -PversionNameSuffix=-nightly -PuseUploadSigning -PlatestTag=${{ steps.get_latest_tag.outputs.latest_tag }} -Pbuild-date-time
 
       - name: Generate nightly version name

diff --git a/.github/workflows/release_tests.yml b/.github/workflows/release_tests.yml
@@ -73,11 +73,12 @@ jobs:
 
       - name: Release tests flows
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: releaseTest_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro

diff --git a/.github/workflows/release_upload_play_store.yml b/.github/workflows/release_upload_play_store.yml
@@ -69,6 +69,8 @@ jobs:
           destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
 
       - name: Assemble the bundle
+        env:
+          MALICIOUS_SITE_PROTECTION_AUTH_TOKEN: ${{ secrets.MALICIOUS_SITE_PROTECTION_AUTH_TOKEN }}
         run: ./gradlew bundleRelease -PuseUploadSigning -Pbuild-date-time
 
       - name: Capture App Bundle Path

diff --git a/.github/workflows/sync-critical-path.yml b/.github/workflows/sync-critical-path.yml
@@ -63,11 +63,12 @@ jobs:
 
       - name: Sync Flows
         uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 120
         with:
           api-key: ${{ secrets.ROBIN_API_KEY }}
           project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
           name: sync_${{ github.sha }}
-          timeout: 120
+          timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
           app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro