Merge release/1.105.0 into main

.github/actions/asana-log-message/action.yml

@@ -17,7 +17,7 @@ inputs:
     description: |
       Name of a template file (without extension) for the comment, relative to 'templates'
       subdirectory of the 'asana-add-comment' action.
-      The file is processed by envsubst before being sent to Asana.
+      The file is processed before being sent to Asana.
     required: false
     type: string
 runs:
@@ -54,9 +54,13 @@ runs:
         fi
 
     - id: add-comment
-      uses: ./.github/actions/asana-add-comment
-      with:
-        access-token: ${{ inputs.access-token }}
-        task-id: ${{ steps.get-automation-subtask.outputs.asana_automation_task_id }}
-        comment: ${{ inputs.comment }}
-        template-name: ${{ inputs.template-name }}
+      shell: bash
+      env:
+        ASANA_ACCESS_TOKEN: ${{ inputs.access-token }}
+        WORKFLOW_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      run: |
+        bundle exec fastlane run asana_add_comment \
+          task_id:"${{ steps.get-automation-subtask.outputs.asana_automation_task_id }}" \
+          comment:"${{ inputs.comment }}" \
+          workflow_url:"${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+          template_name:"${{ inputs.template-name }}"

.github/workflows/bump_internal_release.yml

@@ -57,15 +57,17 @@ jobs:
       - name: Find Asana release task
         id: find-asana-task
         if: github.event.inputs.asana-task-url == null
-        uses: ./.github/actions/asana-find-release-task
-        with:
-          access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
+        env:
+          ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          bundle exec fastlane run asana_find_release_task platform:macos
 
       # When running on schedule, only proceed if there are changes to the release branch (i.e. HEAD is not tagged)
       - name: Check if there are changes to the release branch
         id: check-for-changes
         env:
-          release_branch: ${{ steps.find-asana-task.outputs.release-branch || github.ref_name }}
+          release_branch: ${{ steps.find-asana-task.outputs.release_branch || github.ref_name }}
         run: |
           if [[ "${{ github.event_name }}" != "schedule" ]]; then
             echo "skip-release=false" >> $GITHUB_OUTPUT
@@ -97,9 +99,9 @@ jobs:
       - name: Set parameters
         id: set-parameters
         env:
-          ASANA_TASK_URL: ${{ steps.find-asana-task.outputs.task-url || github.event.inputs.asana-task-url }}
-          RELEASE_BRANCH: ${{ steps.find-asana-task.outputs.release-branch || github.ref_name }}
-          TASK_ID: ${{ steps.find-asana-task.outputs.task-id || steps.task-id.outputs.asana_task_id }}
+          ASANA_TASK_URL: ${{ steps.find-asana-task.outputs.release_task_url || github.event.inputs.asana-task-url }}
+          RELEASE_BRANCH: ${{ steps.find-asana-task.outputs.release_branch || github.ref_name }}
+          TASK_ID: ${{ steps.find-asana-task.outputs.release_task_id || steps.task-id.outputs.asana_task_id }}
           SKIP_APPSTORE: ${{ github.event.inputs.skip-appstore || false }} # make sure this is set to false on scheduled runs
         run: |
           if [[ "${RELEASE_BRANCH}" == "main" ]]; then

.github/workflows/hotfix.yml

@@ -81,12 +81,12 @@ jobs:
             -d "{ \"data\": { \"assignee\": \"$assignee_id\" }}"
 
       - name: Report success
-        uses: ./.github/actions/asana-add-comment
         env:
+          ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
           BRANCH: ${{ steps.make_release_branch.outputs.release_branch_name }}
           RELEASE_TAG: ${{ steps.make_release_branch.outputs.last_release }}
           WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        with:
-          access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
-          task-url: ${{ steps.create_release_task.outputs.asana_task_url }}
-          template-name: hotfix-branch-ready
+        run: |
+          bundle exec fastlane run asana_add_comment \
+            task_url:"${{ steps.create_release_task.outputs.asana_task_url }}" \
+            template_name:"hotfix-branch-ready"

.github/workflows/publish_dmg_release.yml

@@ -386,11 +386,13 @@ jobs:
 
       - name: Add a comment to the release task
         if: success()
-        uses: ./.github/actions/asana-add-comment
-        with:
-          access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
-          task-url: ${{ env.asana-task-url }}
-          template-name: ${{ steps.asana-templates.outputs.release-task-comment-template }}
+        env:
+          ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
+          WORKFLOW_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        run: |
+          bundle exec fastlane run asana_add_comment \
+            task_url:"${{ env.asana-task-url }}" \
+            template_name:"${{ steps.asana-templates.outputs.release-task-comment-template }}"
 
   # This is only run for public and hotfix releases
   create-variants:

Configuration/BuildNumber.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 255
+CURRENT_PROJECT_VERSION = 256

DuckDuckGo/Updates/UpdateController.swift

@@ -190,6 +190,9 @@ final class UpdateController: NSObject, UpdateControllerProtocol {
         updater.updater.automaticallyChecksForUpdates = false
         updater.updater.automaticallyDownloadsUpdates = false
         updater.updater.updateCheckInterval = 0
+#else
+        // Load the appcast to retrieve information about the latest update (required for displaying Release Notes)
+        checkForUpdateInBackground()
 #endif
     }
 

Gemfile.lock

@@ -1,9 +1,13 @@
 GIT
   remote: https://github.com/duckduckgo/fastlane-plugin-ddg_apple_automation
-  revision: 857c55c75a1153746a2db89710b6d69c241d534f
-  tag: 0.5.0
+  revision: ce7c7447eaeeef01974eb1ff6f1e15a2d0e618f5
+  tag: 0.7.0
   specs:
-    fastlane-plugin-ddg_apple_automation (0.5.0)
+    fastlane-plugin-ddg_apple_automation (0.7.0)
+      asana
+      climate_control
+      httpparty
+      octokit
 
 GEM
   remote: https://rubygems.org/
@@ -15,26 +19,32 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
+    asana (2.0.0)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
+      faraday_middleware-multi_json (~> 0.0)
+      oauth2 (>= 1.4, < 3)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.970.0)
-    aws-sdk-core (3.202.2)
+    aws-partitions (1.971.0)
+    aws-sdk-core (3.203.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.89.0)
+      aws-sdk-core (~> 3, >= 3.203.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.159.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.160.0)
+      aws-sdk-core (~> 3, >= 3.203.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.9.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
     claide (1.1.0)
+    climate_control (1.2.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
@@ -75,6 +85,9 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
+    faraday_middleware-multi_json (0.0.6)
+      faraday_middleware
+      multi_json
     fastimage (2.3.1)
     fastlane (2.222.0)
       CFPropertyList (>= 2.3, < 4.0.0)
@@ -154,6 +167,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
+    hashie (5.0.0)
     highline (2.0.3)
     http-cookie (1.0.7)
       domain_name (~> 0.5)
@@ -162,6 +176,8 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
+    httpparty (0.2.0)
+      httparty (> 0)
     jmespath (1.6.2)
     json (2.7.2)
     jwt (2.8.2)
@@ -174,21 +190,34 @@ GEM
     nanaimo (0.3.0)
     naturally (2.2.1)
     nkf (0.2.0)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
+      jwt (>= 1.0, < 3.0)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    octokit (9.1.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
     public_suffix (6.0.1)
+    rack (3.1.7)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.7)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
     security (0.1.5)
     signet (0.19.0)
       addressable (~> 2.8)
@@ -198,7 +227,9 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -209,6 +240,7 @@ GEM
       tty-cursor (~> 0.7)
     uber (0.1.0)
     unicode-display_width (2.5.0)
+    version_gem (1.1.4)
     word_wrap (1.0.0)
     xcodeproj (1.25.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -231,4 +263,4 @@ DEPENDENCIES
   httparty
 
 BUNDLED WITH
-   2.4.4
+   2.4.19

fastlane/Pluginfile

@@ -2,4 +2,4 @@
 #
 # Ensure this file is checked in to source control!
 
-gem 'fastlane-plugin-ddg_apple_automation', git: 'https://github.com/duckduckgo/fastlane-plugin-ddg_apple_automation', tag: '0.5.0'
+gem 'fastlane-plugin-ddg_apple_automation', git: 'https://github.com/duckduckgo/fastlane-plugin-ddg_apple_automation', tag: '0.7.0'