Merge branch 'develop' into jacek/compilation-pixel

.github/workflows/release.yml

@@ -73,20 +73,21 @@ jobs:
         APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
         MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
       run: |
-        bundle exec fastlane release_${{ steps.destination.outputs.destination }}
         app_version="$(cut -d ' ' -f 3 < Configuration/Version.xcconfig)"
         echo "dsyms_path=${{ github.workspace }}/DuckDuckGo.app.dSYM.zip" >> $GITHUB_ENV
         echo "app_version=${app_version}" >> $GITHUB_ENV
+        bundle exec fastlane release_${{ steps.destination.outputs.destination }}
 
     - name: Upload dSYMs artifact
+      if: always()
       uses: actions/upload-artifact@v3
       with:
         name: DuckDuckGo-${{ steps.destination.outputs.destination }}-dSYM-${{ env.app_version }}
         path: ${{ env.dsyms_path }}
 
     - name: Get Asana Task ID
       id: get-task-id
-      if: github.event.inputs.asana-task-url
+      if: ${{ always() && github.event.inputs.asana-task-url }}
       run: |
         task_url_regex='^https://app.asana.com/[0-9]/[0-9]*/([0-9]*)/f$'
         if [[ "${{ github.event.inputs.asana-task-url }}" =~ ${task_url_regex} ]]; then
@@ -96,16 +97,18 @@ jobs:
         fi
 
     - name: Upload debug symbols to Asana
-      if: github.event.inputs.asana-task-url
+      if: ${{ always() && github.event.inputs.asana-task-url }}
       env:
         ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
       run: |
-        asana_dsyms_path="${{ github.workspace }}/DuckDuckGo-${{ env.app_version }}-dSYM.zip"
-        mv -f "${{ env.dsyms_path }}" "$asana_dsyms_path"
+        if [[ -f ${{ env.dsyms_path }} ]]; then
+          asana_dsyms_path="${{ github.workspace }}/DuckDuckGo-${{ env.app_version }}-dSYM.zip"
+          mv -f "${{ env.dsyms_path }}" "$asana_dsyms_path"
 
-        curl -s "https://app.asana.com/api/1.0/tasks/${{ steps.get-task-id.outputs.task_id }}/attachments" \
-          -H "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
-          --form "file=@${asana_dsyms_path};type=application/zip"
+          curl -s "https://app.asana.com/api/1.0/tasks/${{ steps.get-task-id.outputs.task_id }}/attachments" \
+            -H "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
+            --form "file=@${asana_dsyms_path};type=application/zip"
+        fi
 
     - name: Send Mattermost message
       env:

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 7.88.0
+MARKETING_VERSION = 7.89.0

Core/AppPrivacyConfigurationDataProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"b3acf772994c82ed870835c27a94de36\""
-        public static let embeddedDataSHA = "955ebdcac92bf5589e34e174e9cb8bcbe5170c9bbb5f6d0b4fa32290368a22b2"
+        public static let embeddedDataETag = "\"357f365c05692d9674849261a9a91f71\""
+        public static let embeddedDataSHA = "cfa6f910f8d50b88d44a149f0e007bc8fd88b8b3b390ae013618599794d2c077"
     }
 
     public var embeddedDataEtag: String {

Core/UserDefaultsPropertyWrapper.swift

@@ -95,6 +95,8 @@ public struct UserDefaultsWrapper<T> {
         case appTPUsed = "com.duckduckgo.ios.appTrackingProtection.appTPUsed"
 
         case defaultBrowserUsageLastSeen = "com.duckduckgo.ios.default-browser-usage-last-seen"
+
+        case syncEnvironment = "com.duckduckgo.ios.sync-environment"
     }
 
     private let key: Key