PR comments

.github/actions/asana-create-action-item/action.yml

@@ -44,7 +44,7 @@ runs:
         task-url: ${{ inputs.release-task-url }}
 
     - id: get-asana-user-id
-      if: github.event_name != "schedule"
+      if: github.event_name != 'schedule'
       uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}

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

@@ -30,7 +30,7 @@ runs:
         task-url: ${{ inputs.task-url }}
 
     - id: get-asana-user-id
-      if: github.event_name != "schedule"
+      if: github.event_name != 'schedule'
       uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}

.github/workflows/bump_internal_release.yml

@@ -63,13 +63,21 @@ jobs:
             echo "skip-release=false" >> $GITHUB_OUTPUT
           else
             latest_tag="$(git describe --tags --abbrev=0)"
-            changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}")"
+            latest_tag_sha="$(git rev-parse "$latest_tag")"
+            release_branch_sha="$(git rev-parse "origin/${release_branch}")"
 
-            if grep -q -v -e '.github' -e 'scripts' <<< "$changed_files"; then
-              echo "skip-release=false" >> $GITHUB_OUTPUT
-            else
-              echo "::warning::No changes to the release branch (or only changes to scripts and workflows). Skipping automatic release."
+            if [[ "${latest_tag_sha}" == "${release_branch_sha}" ]]; then
+              echo "::warning::Release branch's HEAD is already tagged. Skipping automatic release."
               echo "skip-release=true" >> $GITHUB_OUTPUT
+            else
+              changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}")"
+              if grep -q -v -e '.github' -e 'scripts' <<< "$changed_files"; then
+                echo "::warning::New code changes found in the release branch since the last release. Will bump internal release now."
+                echo "skip-release=false" >> $GITHUB_OUTPUT
+              else
+                echo "::warning::No changes to the release branch (or only changes to scripts and workflows). Skipping automatic release."
+                echo "skip-release=true" >> $GITHUB_OUTPUT
+              fi
             fi
           fi
 

.github/workflows/publish_dmg_release.yml

@@ -110,12 +110,24 @@ jobs:
           fi
           echo "release-version=${TAG//-/.}" >> $GITHUB_OUTPUT
 
+      # Always check out main first, because the release branch might have been deleted (for public releases)
       - name: Check out the code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch all history and tags in order to extract Asana task URLs from git log
           submodules: recursive
-          ref: ${{ inputs.branch || github.ref_name }}
+          ref: main
+
+      - name: Check out the branch if it exists
+        env:
+          branch: ${{ inputs.branch || github.ref_name }}
+        run: |
+          if [[ -z "${branch}" ]] || git ls-remote --exit-code --heads origin "${branch}"; then
+            echo "::notice::Checking out ${branch} branch."
+            git checkout "${branch}"
+          else
+            echo "::notice::Branch ${branch} doesn't exist on the remote repository, staying on main."
+          fi
 
       - name: Select Xcode
         run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer

Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig

@@ -49,10 +49,10 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = macOS NetP VPN App - Review (XPC)
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = macOS NetP VPN App - Release (XPC)
 
-FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
+FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
 
 SWIFT_OBJC_BRIDGING_HEADER =
 SKIP_INSTALL = YES

Configuration/BuildNumber.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 142
+CURRENT_PROJECT_VERSION = 146

Configuration/Common.xcconfig

@@ -21,7 +21,7 @@ COMBINE_HIDPI_IMAGES = YES
 DEVELOPMENT_TEAM = HKE973VLUW
 DEVELOPMENT_TEAM[config=CI][sdk=*] =
 
-FEATURE_FLAGS = FEEDBACK DBP NETWORK_PROTECTION
+FEATURE_FLAGS = FEEDBACK DBP NETWORK_PROTECTION SUBSCRIPTION
 
 GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = DEBUG=1 CI=1 $(inherited)
 GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = DEBUG=1 $(inherited)

Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig

@@ -31,10 +31,10 @@ INFOPLIST_FILE = NetworkProtectionSystemExtension/Info.plist
 INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023 DuckDuckGo. All rights reserved.
 INFOPLIST_KEY_NSSystemExtensionUsageDescription = DuckDuckGo VPN
 
-FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
+FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
 
 PRODUCT_BUNDLE_IDENTIFIER[sdk=*] = $(SYSEX_BUNDLE_ID)
 PRODUCT_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(SYSEX_BUNDLE_ID)

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 1.79.0
+MARKETING_VERSION = 1.80.0