Merge branch 'main' into bunn/dbp/duped-profiles

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	LocalPackages/DataBrokerProtection/Package.swift
#	LocalPackages/LoginItems/Package.swift
#	LocalPackages/NetworkProtectionMac/Package.swift
#	LocalPackages/PixelKit/Package.swift
#	LocalPackages/SubscriptionUI/Package.swift
#	LocalPackages/SwiftUIExtensions/Package.swift
#	LocalPackages/SyncUI/Package.swift
#	LocalPackages/SystemExtensionManager/Package.swift
#	LocalPackages/XPCHelper/Package.swift

.github/workflows/build_appstore.yml

@@ -149,6 +149,7 @@ jobs:
         template-name: debug-symbols-uploaded
 
     - name: Send Mattermost message
+      if: success() || failure() # Don't execute when cancelled
       env:
         WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
         DESTINATION: ${{ env.destination }}
@@ -158,8 +159,7 @@ jobs:
         if [[ -z "${MM_USER_HANDLE}" ]]; then
             echo "Mattermost user handle not known for ${{ github.actor }}, skipping sending message"
         else
-
             curl -s -H 'Content-type: application/json' \
-                -d "$(envsubst < ./scripts/assets/appstore-release-mm-template.json)" \
+                -d "$(envsubst < ./scripts/assets/appstore-release-mm-template.json | jq ".${{ job.status }}")" \
                 ${{ secrets.MM_WEBHOOK_URL }}
         fi

.github/workflows/build_notarized.yml

@@ -296,7 +296,7 @@ jobs:
       run: |
         aws s3 cp \
           ${{ github.workspace }}/${{ steps.create-dmg.outputs.dmg }} \
-          s3://${{ env.RELEASE_BUCKET_NAME }}/${{ env.RELEASE_BUCKET_PREFIX }}/ \\
+          s3://${{ env.RELEASE_BUCKET_NAME }}/${{ env.RELEASE_BUCKET_PREFIX }}/ \
           --acl public-read
 
     - name: Report success
@@ -331,12 +331,17 @@ jobs:
     name: Send Mattermost message
 
     needs: [export-notarized-app, create-dmg]
-    if: ${{ always() && (needs.export-notarized-app.result == 'success') && (needs.create-dmg.result == 'success' || needs.create-dmg.result == 'skipped') }}
+    if: always()
 
     runs-on: ubuntu-latest
 
+    env:
+      success: ${{ (needs.export-notarized-app.result == 'success') && (needs.create-dmg.result == 'success' || needs.create-dmg.result == 'skipped') }}
+      failure: ${{ (needs.export-notarized-app.result == 'failure') || (needs.create-dmg.result == 'failure') }}
+
     steps:
       - name: Send Mattermost message
+        if: ${{ env.success || env.failure }} # Don't execute when cancelled
         env:
           ASANA_TASK_URL: ${{ github.event.inputs.asana-task-url || inputs.asana-task-url }}
           GH_TOKEN: ${{ github.token }}
@@ -356,7 +361,12 @@ jobs:
                   export ASANA_LINK=" | [:asana: Asana task](${ASANA_TASK_URL})"
               fi
 
+              if [[ "${{ env.success }}" == "true" ]]; then
+                  status="success"
+              else
+                  status="failure"
+              fi
               curl -s -H 'Content-type: application/json' \
-                  -d "$(envsubst < message-template.json)" \
+                  -d "$(envsubst < message-template.json | jq ".${status}")" \
                   ${{ secrets.MM_WEBHOOK_URL }}
           fi

.github/workflows/create_variants.yml

@@ -150,8 +150,13 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    env:
+      success: ${{ needs.create-atb-variants.result == 'success' }}
+      failure: ${{ needs.create-atb-variants.result == 'failure' }}
+
     steps:
       - name: Send Mattermost message
+        if: ${{ env.success || env.failure }} # Don't execute when cancelled
         env:
           GH_TOKEN: ${{ github.token }}
           WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
@@ -164,7 +169,13 @@ jobs:
           if [[ -z "${MM_USER_HANDLE}" ]]; then
               echo "Mattermost user handle not known for ${{ github.actor }}, skipping sending message"
           else
+
+              if [[ "${{ env.success }}" == "true" ]]; then
+                  status="success"
+              else
+                  status="failure"
+              fi
               curl -s -H 'Content-type: application/json' \
-                  -d "$(envsubst < message-template.json)" \
+                  -d "$(envsubst < message-template.json | jq ".${status}")" \
                   ${{ secrets.MM_WEBHOOK_URL }}
           fi

.github/workflows/publish_dmg_release.yml

@@ -109,8 +109,8 @@ jobs:
       - name: Upload to S3
         id: upload
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
           AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
         run: |
           # Back up existing appcast2.xml

Configuration/BuildNumber.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 119
+CURRENT_PROJECT_VERSION = 123

Configuration/Tests/IntegrationTests.xcconfig

@@ -22,4 +22,6 @@ FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION DBP
 INFOPLIST_FILE = IntegrationTests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.Integration-Tests
 
+SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/IntegrationTests/Common/IntegrationTestsBridging.h
+
 TEST_HOST=$(BUILT_PRODUCTS_DIR)/DuckDuckGo.app/Contents/MacOS/DuckDuckGo

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 1.75.0
+MARKETING_VERSION = 1.76.0