Merge branch 'main' into sam/remove-survey-manager

* main: (28 commits) Fix bookmark sort UI tests failure (#3219) Add tests for DuckPlayer pixel calculation (#3216) Implement checkbox VPN exclusions UI (#3207) fix zoom updated (#3140) Bump version to 1.105.0 (255) Add DuckPlayer enrollment pixels (#3190) Update PeopleFinders to address broker changes (#3208) Bump BSK with C-S-S to 6.14.0 (#3209) Zoom PDF controls (#3204) Fix exception on Copy in Save dialog (#3205) Remove DuckPlayer onboarding animation (#3198) Fix wrong URL displayed for auth dialog (#3191) Bump version to 1.105.0 (254) UI Ship review feedback for Duck Player onboarding (#3186) Implement bookmarks sort UI tests (#3162) Add bookmarks search UI tests (#3161) Bug: Disable boomark reordering when searching (#3188) Bump version to 1.105.0 (253) Remote feature flag for New Tab Page Improvements (#3176) Fix bookmarks bar issues (#3187) ...
duckduckgo · Sep 6, 2024 · 2ff4ec2 · 2ff4ec2
2 parents 73f4907 + 7ff796a
commit 2ff4ec2
Show file tree

Hide file tree

Showing 73 changed files with 2,385 additions and 524 deletions.
diff --git a/.github/actions/asana-create-action-item/action.yml b/.github/actions/asana-create-action-item/action.yml
@@ -38,22 +38,20 @@ runs:
   using: "composite"
   steps:
     - id: get-automation-subtask
-      uses: ./.github/actions/asana-get-release-automation-subtask-id
-      with:
-        access-token: ${{ inputs.access-token }}
-        task-url: ${{ inputs.release-task-url }}
+      shell: bash
+      env:
+        ASANA_ACCESS_TOKEN: ${{ inputs.access-token }}
+      run: bundle exec fastlane run asana_get_release_automation_subtask_id task_url:"${{ inputs.release-task-url }}"
 
     - id: get-asana-user-id
+      shell: bash
       if: github.event_name != 'schedule'
-      uses: duckduckgo/apple-toolbox/actions/asana-get-user-id-for-github-handle@main
-      with:
-        access-token: ${{ inputs.access-token }}
-        github-handle: ${{ github.actor }}
+      run: bundle exec fastlane run asana_get_user_id_for_github_handle github_handle:"${{ github.actor }}"
 
     - id: set-assignee-id
       shell: bash
       env:
-        USER_ID: ${{ steps.get-asana-user-id.outputs.user-id || steps.get-automation-subtask.outputs.assignee-id }}
+        USER_ID: ${{ steps.get-asana-user-id.outputs.asana_user_id || steps.get-automation-subtask.outputs.asana_assignee_id }}
       run: |
         echo "assignee-id=${USER_ID}" >> $GITHUB_OUTPUT
 
@@ -62,7 +60,7 @@ runs:
       shell: bash
       env:
         ASSIGNEE_ID: ${{ steps.set-assignee-id.outputs.assignee-id }}
-        AUTOMATION_TASK_ID: ${{ steps.get-automation-subtask.outputs.automation-task-id }}
+        AUTOMATION_TASK_ID: ${{ steps.get-automation-subtask.outputs.asana_automation_task_id }}
         TEMPLATE_PATH: ${{ github.action_path }}/templates/${{ inputs.template-name }}.yml
         WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       run: |
@@ -80,7 +78,7 @@ runs:
       shell: bash
       env:
         ASSIGNEE_ID: ${{ steps.set-assignee-id.outputs.assignee-id }}
-        AUTOMATION_TASK_ID: ${{ steps.get-automation-subtask.outputs.automation-task-id }}
+        AUTOMATION_TASK_ID: ${{ steps.get-automation-subtask.outputs.asana_automation_task_id }}
         NOTES: ${{ inputs.notes }}
         TASK_NAME: ${{ inputs.task-name }}
         WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
@@ -93,7 +91,7 @@ runs:
       shell: bash
       env:
         ASSIGNEE_ID: ${{ steps.set-assignee-id.outputs.assignee-id }}
-        AUTOMATION_TASK_ID: ${{ steps.get-automation-subtask.outputs.automation-task-id }}
+        AUTOMATION_TASK_ID: ${{ steps.get-automation-subtask.outputs.asana_automation_task_id }}
         HTML_NOTES: ${{ inputs.html-notes }}
         TASK_NAME: ${{ inputs.task-name }}
         WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
@@ -106,7 +104,7 @@ runs:
       env:
         ASANA_ACCESS_TOKEN: ${{ inputs.access-token }}
         ASSIGNEE_ID: ${{ steps.set-assignee-id.outputs.assignee-id }}
-        TASK_ID: ${{ steps.get-automation-subtask.outputs.automation-task-id }}
+        TASK_ID: ${{ steps.get-automation-subtask.outputs.asana_automation_task_id }}
         PAYLOAD_BASE64: ${{ steps.process-template-payload.outputs.payload-base64 || steps.process-notes-payload.outputs.payload-base64 || steps.process-html-notes-payload.outputs.payload-base64 }}
       run: |
         # Create a subtask and retrieve its ID from the response (.data.gid) to return as an output

diff --git a/.github/actions/asana-get-release-automation-subtask-id/action.yml b/.github/actions/asana-get-release-automation-subtask-id/action.yml
diff --git a/.github/actions/asana-log-message/action.yml b/.github/actions/asana-log-message/action.yml
@@ -24,24 +24,22 @@ runs:
   using: "composite"
   steps:
     - id: get-automation-subtask
-      uses: ./.github/actions/asana-get-release-automation-subtask-id
-      with:
-        access-token: ${{ inputs.access-token }}
-        task-url: ${{ inputs.task-url }}
+      shell: bash
+      env:
+        ASANA_ACCESS_TOKEN: ${{ inputs.access-token }}
+      run: bundle exec fastlane run asana_get_release_automation_subtask_id task_url:"${{ inputs.task-url }}"
 
     - id: get-asana-user-id
+      shell: bash
       if: github.event_name != 'schedule'
-      uses: duckduckgo/apple-toolbox/actions/asana-get-user-id-for-github-handle@main
-      with:
-        access-token: ${{ inputs.access-token }}
-        github-handle: ${{ github.actor }}
+      run: bundle exec fastlane run asana_get_user_id_for_github_handle github_handle:"${{ github.actor }}"
 
     - id: add-colaborator
       shell: bash
       env:
         ASANA_ACCESS_TOKEN: ${{ inputs.access-token }}
-        ASSIGNEE_ID: ${{ steps.get-asana-user-id.outputs.user-id || steps.get-automation-subtask.outputs.assignee-id }}
-        TASK_ID: ${{ steps.get-automation-subtask.outputs.automation-task-id }}
+        ASSIGNEE_ID: ${{ steps.get-asana-user-id.outputs.asana_user_id || steps.get-automation-subtask.outputs.asana_assignee_id }}
+        TASK_ID: ${{ steps.get-automation-subtask.outputs.asana_automation_task_id }}
       run: |
         return_code=$(curl -fLSs "https://app.asana.com/api/1.0/tasks/${TASK_ID}/addFollowers" \
           -H "Authorization: Bearer ${ASANA_ACCESS_TOKEN}" \
@@ -59,6 +57,6 @@ runs:
       uses: ./.github/actions/asana-add-comment
       with:
         access-token: ${{ inputs.access-token }}
-        task-id: ${{ steps.get-automation-subtask.outputs.automation-task-id }}
+        task-id: ${{ steps.get-automation-subtask.outputs.asana_automation_task_id }}
         comment: ${{ inputs.comment }}
         template-name: ${{ inputs.template-name }}
diff --git a/.github/workflows/build_notarized.yml b/.github/workflows/build_notarized.yml
@@ -352,11 +352,12 @@ jobs:
 
     - name: Upload DMG to Asana
       if: ${{ env.upload-to == 'asana' }}
-      uses: ./.github/actions/asana-upload
-      with:
-        access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
-        file-name: ${{ github.workspace }}/duckduckgo-${{ env.app-version }}.dmg
-        task-id: ${{ steps.task-id.outputs.asana_task_id }}
+      env:
+          ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
+      run: |
+        bundle exec fastlane run asana_upload \
+          file_name:"${{ github.workspace }}/duckduckgo-${{ env.app-version }}.dmg" \
+          task_id:"${{ steps.task-id.outputs.asana_task_id }}" 
 
   mattermost:
 

diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml
@@ -47,16 +47,14 @@ jobs:
 
       - name: Get Asana user ID
         id: get-asana-user-id
-        uses: duckduckgo/apple-toolbox/actions/asana-get-user-id-for-github-handle@main
-        with:
-          access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
-          github-handle: ${{ github.actor }}
+        shell: bash
+        run: bundle exec fastlane run asana_get_user_id_for_github_handle github_handle:"${{ github.actor }}"
 
       - name: Create release task
         id: create_release_task
         env:
           ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
-          ASSIGNEE_ID: ${{ steps.get-asana-user-id.outputs.user-id }}
+          ASSIGNEE_ID: ${{ steps.get-asana-user-id.outputs.asana_user_id }}
         run: |
           version="$(echo ${{ steps.make_release_branch.outputs.release_branch_name }} | cut -d '/' -f 2)"
           task_name="macOS App Release $version"

diff --git a/.github/workflows/publish_dmg_release.yml b/.github/workflows/publish_dmg_release.yml
@@ -345,29 +345,32 @@ jobs:
       - name: Upload patch to the Asana task
         id: upload-patch
         if: success()
-        uses: ./.github/actions/asana-upload
-        with:
-          access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
-          file-name: ${{ env.SPARKLE_DIR }}/${{ steps.appcast.outputs.appcast-patch-name }}
-          task-id: ${{ steps.create-task.outputs.new-task-id }}
+        env:
+          ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
+        run: |
+          bundle exec fastlane run asana_upload \
+            file_name:"${{ env.SPARKLE_DIR }}/${{ steps.appcast.outputs.appcast-patch-name }}" \
+            task_id:"${{ steps.create-task.outputs.new-task-id }}" 
 
       - name: Upload old appcast file to the Asana task
         id: upload-old-appcast
         if: success()
-        uses: ./.github/actions/asana-upload
-        with:
-          access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
-          file-name: ${{ env.OLD_APPCAST_NAME }}
-          task-id: ${{ steps.create-task.outputs.new-task-id }}
+        env:
+          ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
+        run: |
+          bundle exec fastlane run asana_upload \
+            file_name:"${{ env.OLD_APPCAST_NAME }}" \
+            task_id:"${{ steps.create-task.outputs.new-task-id }}" 
   
       - name: Upload release notes to the Asana task
         id: upload-release-notes
         if: success()
-        uses: ./.github/actions/asana-upload
-        with:
-          access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
-          file-name: ${{ env.RELEASE_NOTES_FILE }}
-          task-id: ${{ steps.create-task.outputs.new-task-id }}
+        env:
+          ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
+        run: |
+          bundle exec fastlane run asana_upload \
+            file_name:"${{ env.RELEASE_NOTES_FILE }}" \
+            task_id:"${{ steps.create-task.outputs.new-task-id }}" 
         
       - name: Report status
         if: always()

diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 251
+CURRENT_PROJECT_VERSION = 255
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.104.0
+MARKETING_VERSION = 1.105.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 251
		CURRENT_PROJECT_VERSION = 255
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 1.104.0
		MARKETING_VERSION = 1.105.0