Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2025-02-17 01:21:26 +01:00
Code Issues Projects Releases Wiki Activity

Update workflows to accommodate universal pkg artifact for Mac (#888)

Browse Source
This commit is contained in:
Vince Grassia 2021-05-12 10:59:30 -04:00 committed by GitHub
parent d05cd38e70
commit 64492d95cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -362,5 +362,5 @@ jobs:
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg name: Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
path: ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg path: ./dist/mas-universal/Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg

4
.github/workflows/deploy.yml vendored
View File

@ -140,14 +140,14 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: make target directory - name: make target directory
run: mkdir -p dist/mas run: mkdir -p dist/mas-universal
- name: Get mac release asset - name: Get mac release asset
uses: Xotl/cool-github-releases@v1 uses: Xotl/cool-github-releases@v1
with: with:
mode: download mode: download
tag_name: ${{ env.TAG_VERSION }} 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 }} github_token: ${{ secrets.GITHUB_TOKEN }}
- name: Deploy to App Store - name: Deploy to App Store

4
.github/workflows/release.yml vendored
View File

@ -365,6 +365,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.setup.outputs.release_upload_url }} upload_url: ${{ needs.setup.outputs.release_upload_url }}
asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
asset_path: ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg asset_path: ./dist/mas-universal/Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
asset_content_type: application asset_content_type: application

2
package.json
View File

@ -54,7 +54,7 @@
"publish:mac": "npm run build && npm run clean:dist && electron-builder --mac -p always", "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: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\"", "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": { "build": {
"appId": "com.bitwarden.desktop", "appId": "com.bitwarden.desktop",