Test uploading/downloading dmg

duckduckgo · Apr 19, 2024 · 20022a2 · 20022a2
1 parent 560ad40
commit 20022a2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/create_variant.yml b/.github/workflows/create_variant.yml
@@ -92,11 +92,22 @@ jobs:
       uses: actions/download-artifact@v4
       with:
         name: duckduckgo-dmg
-        path: ${{ github.workspace }}/dmg/DuckDuckGo.app
+        path: ${{ github.workspace }}/duckduckgo.dmg
+
+    - 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.download-dmg-artifact.outcome == 'failure' }}
+      if: ${{ steps.extract-app-from-dmg.outcome == 'failure' }}
       run: |
         curl -fLSs "${{ vars.RELEASE_DMG_URL }}" --output duckduckgo.dmg
         hdiutil attach duckduckgo.dmg -mountpoint vanilla

diff --git a/.github/workflows/create_variants.yml b/.github/workflows/create_variants.yml
@@ -83,17 +83,12 @@ jobs:
       - name: Download release app
         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: Upload DMG artifact
         uses: actions/upload-artifact@v4
         with:
           name: duckduckgo-dmg
-          path: ${{ github.workspace }}/dmg/DuckDuckGo.app
+          path: ${{ github.workspace }}/duckduckgo.dmg
           retention-days: 1