From 9f0e9392e3cd5f0ecc6ffbe751b05e12d9c1ecc0 Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <dkapusta@duckduckgo.com>
Date: Sat, 2 Mar 2024 11:03:28 +0100
Subject: [PATCH 1/2] Fix release-type checks

---
 .github/workflows/publish_dmg_release.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish_dmg_release.yml b/.github/workflows/publish_dmg_release.yml
index 8ead92a918..7b161a94e7 100644
--- a/.github/workflows/publish_dmg_release.yml
+++ b/.github/workflows/publish_dmg_release.yml
@@ -45,7 +45,8 @@ jobs:
 
     name: Tag public release
 
-    if: github.event.inputs.release-type != 'internal'
+    # Run if release-type is provided (not empty) an is not internal
+    if: contains(github.event.inputs.release-type, '') == false && github.event.inputs.release-type != 'internal'
 
     uses: ./.github/workflows/tag_release.yml
     with:
@@ -199,7 +200,6 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.TEST_AWS_ACCESS_KEY_ID_RELEASE_S3 }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TEST_AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
           AWS_DEFAULT_REGION: ${{ vars.TEST_AWS_DEFAULT_REGION }}
-          RELEASE_TYPE: ${{ github.event.inputs.release-type }}
           VERSION: ${{ steps.verify-tag.outputs.release-version }}
         run: |
           # Back up existing appcast2.xml
@@ -222,7 +222,7 @@ jobs:
 
       - name: Update Asana for the release
         id: update-asana
-        if: ${{ github.event.inputs.release-type != 'internal' }}
+        if: ${{ env.RELEASE_TYPE != 'internal' }}
         continue-on-error: true
         env:
           ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
@@ -292,7 +292,7 @@ jobs:
 
       - name: Create Asana task to announce the release
         id: create-announcement-task
-        if: ${{ github.event.inputs.release-type != 'internal' }}
+        if: ${{ env.RELEASE_TYPE != 'internal' }}
         uses: ./.github/actions/asana-create-action-item
         env:
           html-notes: ${{ steps.update-asana.outputs.announcement-task-contents }}
@@ -356,7 +356,8 @@ jobs:
 
     needs: [publish-to-sparkle]
 
-    if: ${{ github.event.inputs.release-type != 'internal' }}
+    # Run if release-type is provided (not empty) an is not internal
+    if: contains(github.event.inputs.release-type, '') == false && github.event.inputs.release-type != 'internal'
 
     uses: ./.github/workflows/create_variants.yml
     secrets:

From 4b61f09003b5c95bce77575ec5424b38b36f3b4b Mon Sep 17 00:00:00 2001
From: Dax the Duck <dax@duckduckgo.com>
Date: Sat, 2 Mar 2024 10:04:45 +0000
Subject: [PATCH 2/2] Bump version to 0.72.0 (156)

---
 Configuration/BuildNumber.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
index 8d555e6249..1896f3713a 100644
--- a/Configuration/BuildNumber.xcconfig
+++ b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 155
+CURRENT_PROJECT_VERSION = 156