Merge branch 'release/5.269.0'

Author: github-actions[bot]

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

@@ -10,23 +10,34 @@ inputs:
   project_gid:
     description: 'Asana Project GID to search within'
     required: true
-  username:
-    description: 'The Github username to search for'
+  github_token:
+    description: 'GitHub token for private mapping repo access'
     required: true
+
 outputs:
   task_id:
     description: 'The Asana task ID that was found and assigned'
+    value: ${{ steps.find-asana-release-task.outputs.task_id }}
+
 runs:
   using: 'composite'
   steps:
-    - name: Find task, assign it, and write ID to file
+    - name: Find Asana User ID
+      id: find-asana-user-id
+      uses: duckduckgo/native-github-asana-sync@v2.3
+      with:
+        action: 'get-asana-user-id'
+        github-username: ${{ github.actor }}
+        github-pat: ${{ inputs.github_token }}
+
+    - name: Find Asana Release task, assign it, and write ID to file
+      id: find-asana-release-task
       shell: bash
       env: # Make inputs available as environment variables for easier access in the script
         INPUT_TASK_NAME: ${{ inputs.task_name }}
         INPUT_ASANA_TOKEN: ${{ inputs.asana_token }}
         INPUT_PROJECT_GID: ${{ inputs.project_gid }}
-        INPUT_USERNAME: ${{ inputs.username }}
-        OUTPUT_FILE_PATH: "${{ github.workspace }}/asana_task_id.txt" # Define the output file path
+        INPUT_ASANA_USER_ID: ${{ steps.find-asana-user-id.outputs.asanaUserId }}
       run: |
         set -e # Exit immediately if a command exits with a non-zero status.
         echo "Searching for task: '$INPUT_TASK_NAME' in project GID: '$INPUT_PROJECT_GID'"
@@ -41,57 +52,27 @@ runs:
 
         if [ -z "$found_task_id" ]; then
           echo "::error::No task with the exact name '$INPUT_TASK_NAME' found in project GID '$INPUT_PROJECT_GID'."
-          # Write an empty string or a specific marker to the file if task not found
-          echo "TASK_NOT_FOUND" > "$OUTPUT_FILE_PATH" 
           exit 1
         else
           echo "Found Task ID: '$found_task_id'"
-          # Write the found task ID to the specified file
-          echo "$found_task_id" > "$OUTPUT_FILE_PATH"
-          echo "Task ID successfully written to $OUTPUT_FILE_PATH"
         fi
 
-        # --- Get Asana User ID ---
-        # Assuming github_asana_mapping.yml is at .github/actions/assign-release-task/github_asana_mapping.yml
-        # relative to the REPO ROOT, not the action directory itself during runtime.
-        # For composite actions, paths in scripts are relative to github.workspace.
-        # If the mapping file is part of the action's folder, the path might need to be:
-        # ${{ github.action_path }}/github_asana_mapping.yml
-        # However, it's often better if such mapping files are at a known repo location.
-        # Let's assume it's checked into the root for simplicity here, or adjust as needed.
-        MAPPING_FILE="${{ github.workspace }}/.github/actions/assign-release-task/github_asana_mapping.yml" # Or adjust path
-        
-        echo "Looking up Asana User ID for GitHub user: '$INPUT_USERNAME' in file: '$MAPPING_FILE'"
-        if [ ! -f "$MAPPING_FILE" ]; then
-            echo "::error::Mapping file not found at $MAPPING_FILE"
-            echo "USER_MAPPING_FILE_NOT_FOUND" > "$OUTPUT_FILE_PATH" # Overwrite with error state
-            exit 1
+        echo "Assigning task ID $found_task_id to user ID $INPUT_ASANA_USER_ID"
+
+        # Assign the task to the user
+        response=$(curl -s -X PUT "https://app.asana.com/api/1.0/tasks/${found_task_id}" \
+          -H "Authorization: Bearer ${INPUT_ASANA_TOKEN}" \
+          -H "Content-Type: application/json" \
+          -d "{\"data\": {\"assignee\": \"${INPUT_ASANA_USER_ID}\"}}")
+
+        # Check if the assignment was successful
+        status=$(echo $response | jq -r '.errors')
+
+        if [ "$status" == "null" ]; then
+          echo "Task $found_task_id successfully assigned to user $INPUT_ASANA_USER_ID."
+          echo "task_id=$found_task_id" >> "$GITHUB_OUTPUT"
+        else
+          echo "Failed to assign task: $status"
+          exit 1
         fi
-      
-#        asana_user_id=$(grep -E "^$username: " .github/actions/assign-release-task/github_asana_mapping.yml | awk -F': ' '{print $2}' | tr -d '"')
-#
-#        if [ -z "asana_user_id" ]; then
-#          echo "User $username not found."
-#          exit 1
-#        else
-#          echo "User ID for $username: $asana_user_id"
-#        fi
-#
-#        echo "Assigning task ID $task_id to user ID $asana_user_id"
-#
-#        # Assign the task to the user
-#        response=$(curl -s -X PUT "https://app.asana.com/api/1.0/tasks/${task_id}" \
-#          -H "Authorization: Bearer ${asana_token}" \
-#          -H "Content-Type: application/json" \
-#          -d "{\"data\": {\"assignee\": \"${asana_user_id}\"}}")
-#
-#        # Check if the assignment was successful
-#        status=$(echo $response | jq -r '.errors')
-#
-#        if [ "$status" == "null" ]; then
-#          echo "Task $task_id successfully assigned to user $asana_user_id."
-#        else
-#          echo "Failed to assign task: $status"
-#          exit 1
-#        fi
-#
+

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

@@ -22,6 +22,8 @@ jobs:
   code_formatting:
     name: Code Formatting
     runs-on: ubuntu-24.04
+    env:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
     steps:
       - name: Checkout repository
@@ -47,6 +49,8 @@ jobs:
   unit_tests:
     name: Unit tests
     runs-on: android-large-runner
+    env:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
     steps:
       - name: Checkout repository
@@ -82,6 +86,8 @@ jobs:
   lint:
     name: Lint
     runs-on: android-large-runner
+    env:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
     steps:
       - name: Checkout repository

.github/workflows/ci.yml

@@ -22,6 +22,8 @@ jobs:
   code_formatting:
     name: Code Formatting
     runs-on: android-large-runner
+    env:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
     steps:
       - name: Checkout repository
@@ -48,6 +50,8 @@ jobs:
   unit_tests:
     name: Unit tests
     runs-on: android-large-runner
+    env:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
     steps:
       - name: Checkout repository
@@ -84,6 +88,8 @@ jobs:
   lint:
     name: Lint
     runs-on: android-large-runner
+    env:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
     steps:
       - name: Checkout repository

.github/workflows/nightly.yml

@@ -31,6 +31,15 @@ jobs:
     runs-on: macos-latest
 
     steps:
+      - name: Check app-version value
+        run: |
+          if [ "${{ inputs.app-version }}" == "PLACEHOLDER" ]; then
+            echo "Input value cannot be 'PLACEHOLDER'."
+            exit 1
+          else
+            echo "Input value is valid: ${{ inputs.app-version }}"
+          fi
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

.github/workflows/release_create_tag.yml

@@ -29,14 +29,6 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - name: Check app-version value
-        run: |
-          if [ "${{ inputs.app-version }}" == "PLACEHOLDER" ]; then
-            echo "Input value cannot be 'PLACEHOLDER'."
-            exit 1
-          else
-            echo "Input value is valid: ${{ inputs.app-version }}"
-          fi
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -71,35 +63,14 @@ jobs:
           task_name: 'Android Release ${{ inputs.app-version }}'
           asana_token: ${{ secrets.ASANA_ACCESS_TOKEN }}
           project_gid: ${{ vars.GH_ANDROID_RELEASE_BOARD_PROJECT_ID }}
-          username: ${{ github.actor }}
-
-      - name: Read Task ID from file and set as output
-        id: read_task_output_step
-        run: |
-          OUTPUT_FILE="${{ github.workspace }}/asana_task_id.txt"
-          echo "Attempting to read Task ID from file: $OUTPUT_FILE"
-          if [ -f "$OUTPUT_FILE" ]; then
-            TASK_ID_VALUE=$(cat "$OUTPUT_FILE")
-            echo "Raw content from file: '$TASK_ID_VALUE'"
-            # Check for error markers
-            if [[ "$TASK_ID_VALUE" == "TASK_NOT_FOUND" || "$TASK_ID_VALUE" == "USER_MAPPING_FILE_NOT_FOUND" || "$TASK_ID_VALUE" == "USER_NOT_IN_MAPPING" ]]; then
-              echo "::error::Error marker found in output file: $TASK_ID_VALUE"
-              echo "task_id=" >> "$GITHUB_OUTPUT" # Set actual output to empty on error
-            else
-              echo "Successfully read Task ID: '$TASK_ID_VALUE'"
-              echo "task_id=$TASK_ID_VALUE" >> "$GITHUB_OUTPUT"
-            fi
-          else
-            echo "::error::Output file $OUTPUT_FILE not found!"
-            echo "task_id=" >> "$GITHUB_OUTPUT" # Set actual output to empty if file not found
-          fi
+          github_token: ${{ secrets.DAXMOBILE_ANDROID_AUTOMATION }}
 
       - name: Get Asana Task Permalink
         id: get-task-permalink
         uses: duckduckgo/native-github-asana-sync@v2.0
         with:
           asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
-          asana-task-id: ${{ steps.read_task_output_step.outputs.task_id }}
+          asana-task-id: ${{ steps.assign-release-task.outputs.task_id }}
           action: 'get-asana-task-permalink'
 
       - name: Notify Mattermost of Task created

.github/workflows/release_create_task.yml

@@ -16,12 +16,14 @@ tags:
           id: "omnibarTextInput"
       - inputText: "https://privacy-test-pages.site"
       - pressKey: Enter
-      - runFlow: ../shared/browser_screen/click_on_menu_button.yaml
+      - tapOn:
+          id: 'com.duckduckgo.mobile.android:id/browserMenuImageView'
       - assertVisible:
           text: "add bookmark"
       - tapOn:
           text: "add bookmark"
-      - runFlow: ../shared/browser_screen/click_on_menu_button.yaml
+      - tapOn:
+          id: 'com.duckduckgo.mobile.android:id/browserMenuImageView'
       - assertVisible:
           text: "bookmarks"
       - tapOn:

.maestro/bookmarks/ensure_bookmarks_can_be_added_and_deleted.yaml

@@ -24,12 +24,14 @@ tags:
       - pressKey: Enter
       - assertVisible:
             text: "Privacy Test Pages"
-      - runFlow: ../shared/browser_screen/click_on_menu_button.yaml
+      - tapOn:
+          id: 'com.duckduckgo.mobile.android:id/browserMenuImageView'
       - assertVisible:
             text: "add bookmark"
       - tapOn:
             text: "add bookmark"
-      - runFlow: ../shared/browser_screen/click_on_menu_button.yaml
+      - tapOn:
+          id: 'com.duckduckgo.mobile.android:id/browserMenuImageView'
       - assertVisible:
             text: "bookmarks"
       - tapOn:

.maestro/bookmarks/open_bookmark_and_navigate_back.yaml

@@ -18,7 +18,8 @@ tags:
             - pressKey: Enter
             - assertVisible:
                   text: "Privacy Test Pages"
-            - runFlow: ../shared/browser_screen/click_on_menu_button.yaml
+            - tapOn:
+                id: 'com.duckduckgo.mobile.android:id/browserMenuImageView'
             - assertVisible:
                   text: "add bookmark"
             - tapOn:
@@ -29,7 +30,8 @@ tags:
             - pressKey: Enter
             - assertVisible:
                 text: "Search engine"
-            - runFlow: ../shared/browser_screen/click_on_menu_button.yaml
+            - tapOn:
+                id: 'com.duckduckgo.mobile.android:id/browserMenuImageView'
             - assertVisible:
                   text: "bookmarks"
             - tapOn:

.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml

@@ -1,7 +1,7 @@
 appId: com.duckduckgo.mobile.android
 name: "DuckPlayer: Always > SERP > Carousel > Duck Player"
-tags:
-  - duckplayer
+#tags:
+#  - duckplayer
 ---
 - retry:
     maxRetries: 3