From 64492d95cfa2ca047526d3fd5cec8b10cf5ab0b9 Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Wed, 12 May 2021 10:59:30 -0400
Subject: [PATCH] Update workflows to accommodate universal pkg artifact for
 Mac (#888)

---
 .github/workflows/build.yml   | 4 ++--
 .github/workflows/deploy.yml  | 4 ++--
 .github/workflows/release.yml | 4 ++--
 package.json                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82072d6e..892496bf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -362,5 +362,5 @@ jobs:
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@v2
         with:
-          name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
-          path: ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          name: Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
+          path: ./dist/mas-universal/Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bc5c96bb..4b21a1e5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -140,14 +140,14 @@ jobs:
         uses: actions/checkout@v2
 
       - name: make target directory
-        run: mkdir -p dist/mas
+        run: mkdir -p dist/mas-universal
 
       - name: Get mac release asset
         uses: Xotl/cool-github-releases@v1
         with:
           mode: download
           tag_name: ${{ env.TAG_VERSION }}
-          assets: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg|./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          assets: Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg|./dist/mas-universal/Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Deploy to App Store
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c37856ee..93f4a5af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -365,6 +365,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
-          asset_path: ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
+          asset_path: ./dist/mas-universal/Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
           asset_content_type: application
diff --git a/package.json b/package.json
index bfd9083f..941c364b 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "publish:mac": "npm run build && npm run clean:dist && electron-builder --mac -p always",
     "publish:mac:mas": "npm run dist:mac:mas && npm run upload:mas",
     "publish:win": "npm run build && npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p always -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
-    "upload:mas": "xcrun altool --upload-app --type osx --file \"$(find ./dist/mas/Bitwarden*.pkg)\" --username $APPLE_ID_USERNAME --password $APPLE_ID_PASSWORD"
+    "upload:mas": "xcrun altool --upload-app --type osx --file \"$(find ./dist/mas-universal/Bitwarden*.pkg)\" --username $APPLE_ID_USERNAME --password $APPLE_ID_PASSWORD"
   },
   "build": {
     "appId": "com.bitwarden.desktop",