Merge branch 'release/5.237.0'

Author: github-actions[bot]

.github/actions/assign-release-task/action.yml

@@ -13,6 +13,9 @@ inputs:
   username:
     description: 'The Github username to search for'
     required: true
+outputs:
+  task_id:
+    description: 'The Asana task ID that was found and assigned'
 runs:
   using: 'composite'
   steps:
@@ -36,6 +39,7 @@ runs:
           exit 1
         else
           echo "Task ID for the task named '$task_name': $task_id"        
+          echo "task_id=$task_id" >> $GITHUB_OUTPUT
         fi
       
         asana_user_id=$(grep -E "^$username: " .github/actions/assign-release-task/github_asana_mapping.yml | awk -F': ' '{print $2}' | tr -d '"')

.github/workflows/release_create_tag.yml

@@ -54,7 +54,7 @@ jobs:
           mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
           mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
           mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
-          mattermost-message: ${{env.emoji_start}} Release ${{ github.event.inputs.app-version }}. Tag created.
+          mattermost-message: ${{env.emoji_info}} Release ${{ github.event.inputs.app-version }}. Tag created https://github.com/duckduckgo/Android/releases/tag/${{ github.event.inputs.app-version }}
           action: 'send-mattermost-message'
 
       - name: Create Asana task when workflow failed

.github/workflows/release_create_task.yml

@@ -63,14 +63,22 @@ jobs:
           project_gid: ${{ vars.GH_ANDROID_RELEASE_BOARD_PROJECT_ID }}
           username: ${{ github.actor }}
 
+      - name: Get Asana Task Permalink
+        id: get-task-permalink
+        uses: duckduckgo/[email protected]
+        with:          
+          asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
+          asana-task-id: ${{ steps.assign-release-task.outputs.task_id }}
+          action: 'get-asana-task-permalink'
+
       - name: Notify Mattermost of Task created
         id: send-mm-task-created
         uses: duckduckgo/[email protected]
         with:
           mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
           mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
           mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
-          mattermost-message: ${{env.emoji_info}} Release ${{ github.event.inputs.app-version }} Asana task successfully created. See https://app.asana.com/0/1184843898389381/1205105962934096
+          mattermost-message: ${{env.emoji_info}} Release ${{ github.event.inputs.app-version }}. Task created successfully ${{ steps.get-task-permalink.outputs.asanaTaskPermalink }}
           action: 'send-mattermost-message'
 
       - name: Create Asana task when workflow failed

.github/workflows/release_production.yml

@@ -1,25 +1,27 @@
-name: Run Release Tests in Maestro
+name: Release - Run E2E Maestro Tests
 
 on:
   workflow_dispatch:
     inputs:
       app-version:
-        description: 'App Version for Release'
+        description: 'App Version for Testing'
         required: true
         default: 'PLACEHOLDER'
+      test-tag:
+        description: 'Maestro Tests tag to include'
+        required: true
+        default: 'releaseTest'
 
 env:
   ASANA_PAT: ${{ secrets.ASANA_ACCESS_TOKEN }}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  emoji_info: ":information_source:" # ℹ️
+  emoji_success: ":white_check_mark:" # ✅
+  emoji_failure: ":x:" # ❌
 
 jobs:
   run-release-tests:
-    name: Run Release tests of tag version in Maestro
-    runs-on: ubuntu-24.04
-
+    name: Create and Push git tag for version
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -68,21 +70,122 @@ jobs:
           mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
           mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
           mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
-          mattermost-message: Starting to run Release tests for version ${{ github.event.inputs.app-version }} successfully created. See https://app.asana.com/0/1184843898389381/1205105962934096
+          mattermost-message: ${{env.emoji_info}} Release ${{ github.event.inputs.app-version }}. Running Maestro tests for tag ${{ github.event.inputs.test-tag }} https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
           action: 'send-mattermost-message'
 
-      - name: Release tests flows
-        uses: mobile-dev-inc/[email protected]
+      - name: Maestro tests flows
+        id: release-tests
+        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: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
-          app-file: apk/release.apk
           android-api-level: 30
           workspace: .maestro
-          include-tags: releaseTest
+          include-tags: ${{ github.event.inputs.test-tag }}
+
+      - name: Analyze Maestro Flow Results
+        id: analyze-flow-results
+        if: always()
+        run: |
+          echo "Console URL: ${{ steps.release-tests.outputs.MAESTRO_CLOUD_CONSOLE_URL }}"
+          echo "Upload Status: ${{ steps.release-tests.outputs.MAESTRO_CLOUD_UPLOAD_STATUS }}"
+          echo "App Binary ID: ${{ steps.release-tests.outputs.MAESTRO_CLOUD_APP_BINARY_ID }}"
+          
+          flow_results_json='${{ steps.release-tests.outputs.MAESTRO_CLOUD_FLOW_RESULTS }}'
+          echo "Raw Flow Results JSON: $flow_results_json"
+          
+          # Default to success, change if issues are found
+          final_status="success" 
+
+          # Check for empty or invalid JSON (though Maestro action should provide valid JSON)
+          if ! echo "$flow_results_json" | jq -e . > /dev/null 2>&1; then
+            echo "::warning::MAESTRO_CLOUD_FLOW_RESULTS is not valid JSON or is empty."
+            final_status="unknown_format"
+          else
+            # Check for any flow with status "ERROR"
+            if echo "$flow_results_json" | jq -e '.[] | select(.status=="ERROR")' > /dev/null; then
+              echo "::error::At least one Maestro flow has status: ERROR."
+              final_status="failure"
+            fi
+
+            # Check for any flow with status "CANCELED"
+            # You might decide if CANCELED flows also mean the overall status is a failure for your release
+            if echo "$flow_results_json" | jq -e '.[] | select(.status=="CANCELED")' > /dev/null; then
+              echo "::warning::At least one Maestro flow has status: CANCELED."
+              # If any canceled flow makes the whole thing a failure:
+              if [ "$final_status" != "failure" ]; then # Don't override if already a critical failure
+                 final_status="canceled_present" # Or treat as "failure" if preferred
+              fi
+            fi
+
+            # If after all checks, final_status is still "success", it means no "ERROR" or "CANCELED"
+            if [ "$final_status" == "success" ]; then
+                # Additional check: ensure there's at least one flow and it's not empty array if that's a concern
+                if echo "$flow_results_json" | jq -e '. | length > 0' > /dev/null; then
+                    echo "All flows appear to be successful (no ERROR or CANCELED statuses found that are treated as errors)."
+                else
+                    echo "::warning::MAESTRO_CLOUD_FLOW_RESULTS is an empty array. No flows reported."
+                    final_status="empty_results" # Or "success" if empty results are acceptable
+                fi
+            fi
+          fi
+
+          echo "Final determined status: $final_status"
+          echo "flow_summary_status=$final_status" >> $GITHUB_OUTPUT
+
+      - name: Access Outputs (for debugging)
+        if: always()
+        run: |
+          echo "Console URL: ${{ steps.release-tests.outputs.MAESTRO_CLOUD_CONSOLE_URL }}"
+          echo "Flow Results (JSON): ${{ steps.release-tests.outputs.MAESTRO_CLOUD_FLOW_RESULTS }}"
+          echo "Release Tests Step Conclusion: ${{ steps.release-tests.conclusion }}" # From Maestro action itself
+          echo "Analyzed Flow Summary Status: ${{ steps.analyze-flow-results.outputs.flow_summary_status }}" # From our script
+
+      - name: Notify Mattermost - Maestro Tests ALL SUCCEEDED
+        # Condition 1: Our script says success
+        # Condition 2: The Maestro action itself also reported overall success
+        if: always() && steps.analyze-flow-results.outputs.flow_summary_status == 'success' && steps.release-tests.conclusion == 'success'
+        uses: duckduckgo/[email protected]
+        with:
+          action: 'send-mattermost-message'
+          mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
+          mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
+          mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
+          mattermost-message: |
+            ${{env.emoji_success}} Release ${{ github.event.inputs.app-version }}: Tests for for tag ${{ github.event.inputs.test-tag }} PASSED successfully.
+            Console: ${{ steps.release-tests.outputs.MAESTRO_CLOUD_CONSOLE_URL }}
+            Flow Results: json ${{ steps.release-tests.outputs.MAESTRO_CLOUD_FLOW_RESULTS }}
+
+      - name: Notify Mattermost - Maestro Tests FAILURES or ISSUES DETECTED
+        # Condition: Our script detected 'failure' OR the Maestro action itself reported failure
+        if: always() && (steps.analyze-flow-results.outputs.flow_summary_status == 'failure' || steps.release-tests.conclusion == 'failure')
+        uses: duckduckgo/[email protected]
+        with:
+          action: 'send-mattermost-message'
+          mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
+          mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
+          mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
+          mattermost-message: |
+            ${{env.emoji_failure}} Release ${{ github.event.inputs.app-version }}: Tests for tag ${{ github.event.inputs.test-tag }} FAILED or encountered issues.          
+            Console: ${{ steps.release-tests.outputs.MAESTRO_CLOUD_CONSOLE_URL }}
+            Flow Results: json ${{ steps.release-tests.outputs.MAESTRO_CLOUD_FLOW_RESULTS }}
+
+      - name: Notify Mattermost - Maestro Tests CANCELED Flows Present (Informational or Warning)
+        # Condition: Our script detected 'canceled_present' AND no critical 'failure' was found
+        # AND Maestro action itself didn't mark the whole run as a 'failure'
+        if: always() && steps.analyze-flow-results.outputs.flow_summary_status == 'canceled_present' && steps.release-tests.conclusion != 'failure'
+        uses: duckduckgo/[email protected]
+        with:
+          action: 'send-mattermost-message'
+          mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
+          mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
+          mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
+          mattermost-message: |
+            :warning: Release ${{ github.event.inputs.app-version }}: Some tests for tag ${{ github.event.inputs.test-tag }} were CANCELED. Please review.          
+            Console: ${{ steps.release-tests.outputs.MAESTRO_CLOUD_CONSOLE_URL }}
+            Flow Results: json ${{ steps.release-tests.outputs.MAESTRO_CLOUD_FLOW_RESULTS }}
 
       - name: Create Asana task when workflow failed
         if: ${{ failure() }}
@@ -95,14 +198,3 @@ jobs:
           asana-task-name: GH Workflow Failure - Tag Android Release (Robin)
           asana-task-description: Run Release Tests in Maestro has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
           action: 'create-asana-task'
-
-      - name: Notify Mattermost when workflow failed
-        if: ${{ failure() }}
-        id: send-mm-message-error
-        uses: duckduckgo/[email protected]
-        with:
-          mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
-          mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
-          mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
-          asana-task-description: Run Release Tests in Maestro has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
-          action: 'send-mattermost-message'

.github/workflows/release_tests.yml

@@ -12,6 +12,7 @@ env:
   GH_TOKEN: ${{ secrets.GT_DAXMOBILE }}
   GOOGLE_APPLICATION_CREDENTIALS: '#{ENV["HOME"]}/jenkins_static/com.duckduckgo.mobile.android/ddg-upload-firebase.json'
   emoji_info: ":information_source:" # ℹ️
+  emoji_end: ":flight_arrival:" # 🛫
 
 jobs:
   release-production:
@@ -91,7 +92,7 @@ jobs:
           mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
           mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
           mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
-          mattermost-message: ${{env.emoji_start}} Release ${{ github.event.inputs.app-version }}. AAB uploaded to Play Store. See https://play.google.com/console/u/0/developers/5949020878215944484/app/4974643806384870294/releases/overview
+          mattermost-message: ${{env.emoji_start}} Release ${{ github.event.inputs.app-version }} uploaded to Play Store. See https://play.google.com/console/u/0/developers/5949020878215944484/app/4974643806384870294/releases/overview
           action: 'send-mattermost-message'
 
       - name: Upload Universal APK to Github
@@ -106,7 +107,17 @@ jobs:
           mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
           mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
           mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
-          mattermost-message: ${{env.emoji_start}} Release ${{ github.event.inputs.app-version }}. Universal APK uploaded to Github. See https://github.com/duckduckgo/Android/releases
+          mattermost-message: ${{env.emoji_start}} Release ${{ github.event.inputs.app-version }} uploaded to Github https://github.com/duckduckgo/Android/releases/tag/${{ github.event.inputs.app-version }}
+          action: 'send-mattermost-message'
+
+      - name: Notify Mattermost of Release completed
+        id: send-mm-message-gh-upload
+        uses: duckduckgo/[email protected]
+        with:
+          mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
+          mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
+          mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
+          mattermost-message: ${{env.emoji_end}} Release ${{ github.event.inputs.app-version }} completed successfully and is now in review.
           action: 'send-mattermost-message'
 
       - name: Create Asana task when workflow failed

.github/workflows/release_upload_play_store.yml

@@ -0,0 +1,26 @@
+name: Test - Workflow for Testing
+
+on:
+  workflow_dispatch:
+
+    inputs:
+      ref:
+        description: 'This is an example of an input'
+        required: true
+
+env:
+  ASANA_PAT: ${{ secrets.ASANA_ACCESS_TOKEN }}
+  GH_TOKEN: ${{ secrets.GT_DAXMOBILE }}
+
+jobs:
+  test-workflow:
+    runs-on: ubuntu-latest
+    name: Add here whatever steps you want to test
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.GT_DAXMOBILE }}
+          ref: ${{ github.event.inputs.ref }}

.github/workflows/test_workflow.yml

@@ -13,8 +13,7 @@ tags:
       - inputText: "https://www.search-company.site/#ad-id-10"
       - pressKey: Enter
 
-      - tapOn:
-          id: "com.duckduckgo.mobile.android:id/fireIconMenu"
+      - runFlow: ../shared/browser_screen/click_on_fire_button.yaml
       - tapOn:
           text: "Cancel"
       - assertVisible:
@@ -23,8 +22,7 @@ tags:
           id: "ad-id-10"
       - assertVisible:
           text: "Publisher site"
-      - tapOn:
-          id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
+      - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml
       - assertVisible:
           text: "View Tracker Companies"
       - tapOn:

.maestro/ad_click_detection_flows/10_-_m.js_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml

@@ -13,8 +13,7 @@ tags:
       - inputText: "https://www.search-company.site/#ad-id-11"
       - pressKey: Enter
 
-      - tapOn:
-          id: "com.duckduckgo.mobile.android:id/fireIconMenu"
+      - runFlow: ../shared/browser_screen/click_on_fire_button.yaml
       - tapOn:
           text: "Cancel"
       - assertVisible:
@@ -23,8 +22,7 @@ tags:
           id: "ad-id-11"
       - assertVisible:
           text: "Publisher site"
-      - tapOn:
-          id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
+      - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml
       - assertVisible:
           text: "View Tracker Companies"
       - tapOn:

.maestro/ad_click_detection_flows/11_-_y.js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf_u3_not_needed.yaml

@@ -13,8 +13,7 @@ tags:
       - inputText: "https://www.search-company.site/#ad-id-12"
       - pressKey: Enter
 
-      - tapOn:
-          id: "com.duckduckgo.mobile.android:id/fireIconMenu"
+      - runFlow: ../shared/browser_screen/click_on_fire_button.yaml
       - tapOn:
           text: "Cancel"
       - assertVisible:
@@ -23,8 +22,7 @@ tags:
           id: "ad-id-12"
       - assertVisible:
           text: "Publisher site"
-      - tapOn:
-          id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
+      - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml
       - assertVisible:
           text: "View Tracker Companies"
       - tapOn: