From 0d90f5aa3397ff9101fac73044f616c35a0e9c67 Mon Sep 17 00:00:00 2001
From: Alessandro Boron <aboron@duckduckgo.com>
Date: Fri, 19 Apr 2024 16:34:55 +1000
Subject: [PATCH] Clean up workflow

---
 .github/workflows/create_variant.yml | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/create_variant.yml b/.github/workflows/create_variant.yml
index 6883a3e76a..00a0643916 100644
--- a/.github/workflows/create_variant.yml
+++ b/.github/workflows/create_variant.yml
@@ -94,27 +94,20 @@ jobs:
         name: duckduckgo-dmg
         path: ${{ github.workspace }}
 
-    - name: Extract App from DMG
-      id: extract-app-from-dmg
-      if: ${{ steps.download-dmg-artifact.outcome == 'success' }}
-      continue-on-error: true
-      run: |
-        hdiutil attach duckduckgo.dmg -mountpoint vanilla
-        mkdir -p dmg
-        cp -R vanilla/DuckDuckGo.app dmg/DuckDuckGo.app
-        hdiutil detach vanilla
-        rm -f duckduckgo.dmg
-
     - name: Download release app
       # Download the release app only if download-dmg-artifact fails
-      if: ${{ steps.extract-app-from-dmg.outcome == 'failure' }}
+      if: ${{ steps.download-dmg-artifact.outcome == 'failure' }}
       run: |
         curl -fLSs "${{ vars.RELEASE_DMG_URL }}" --output duckduckgo.dmg
-        hdiutil attach duckduckgo.dmg -mountpoint vanilla
-        mkdir -p dmg
-        cp -R vanilla/DuckDuckGo.app dmg/DuckDuckGo.app
-        hdiutil detach vanilla
-        rm -f duckduckgo.dmg
+
+    - name: Extract App from DMG
+      id: extract-app-from-dmg
+      run: |
+          hdiutil attach duckduckgo.dmg -mountpoint vanilla
+          mkdir -p dmg
+          cp -R vanilla/DuckDuckGo.app dmg/DuckDuckGo.app
+          hdiutil detach vanilla
+          rm -f duckduckgo.dmg
 
     - name: Install create-dmg
       run: brew install create-dmg