Merge pull request #931 from bitwarden/hotfix/remove-universal

Revert universal build

.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 }}-universal.pkg
-          path: ./dist/mas-universal/Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
+          name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          path: ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg

.github/workflows/deploy.yml

@@ -155,14 +155,14 @@ jobs:
           ref: ${{ env.TAG_VERSION }}
 
       - name: make target directory
-        run: mkdir -p dist/mas-universal
+        run: mkdir -p dist/mas
 
       - name: Get mac release asset
         uses: Xotl/cool-github-releases@v1
         with:
           mode: download
           tag_name: ${{ env.TAG_VERSION }}
-          assets: Bitwarden-${{ env.PKG_VERSION }}-universal.pkg|./dist/mas-universal/Bitwarden-${{ env.PKG_VERSION }}-universal.pkg
+          assets: Bitwarden-${{ env.PKG_VERSION }}.pkg|./dist/mas/Bitwarden-${{ env.PKG_VERSION }}.pkg
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Deploy to App Store

.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 }}-universal.pkg
-          asset_path: ./dist/mas-universal/Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
+          asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          asset_path: ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
           asset_content_type: application

package.json

@@ -39,8 +39,8 @@
     "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never",
     "pack:mac": "npm run clean:dist && electron-builder --mac -p never",
     "pack:mac:arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never",
-    "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas --universal -p never",
-    "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev --universal -p never",
+    "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas -p never",
+    "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev -p never",
     "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
     "pack:win:ci": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never",
     "dist:dir": "npm run build && npm run pack:dir",
@@ -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-universal/Bitwarden*.pkg)\" --username $APPLE_ID_USERNAME --password $APPLE_ID_PASSWORD"
+    "upload:mas": "xcrun altool --upload-app --type osx --file \"$(find ./dist/mas/Bitwarden*.pkg)\" --username $APPLE_ID_USERNAME --password $APPLE_ID_PASSWORD"
   },
   "build": {
     "appId": "com.bitwarden.desktop",

src/package.json

@@ -2,7 +2,7 @@
   "name": "bitwarden",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "1.26.4",
+  "version": "1.26.5",
   "author": "Bitwarden Inc. <[email protected]> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",