Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-29 12:55:21 +01:00
Code Issues Projects Releases Wiki Activity

Updating the release workflow with the new channels

Browse Source
This commit is contained in:
Joseph Flinn 2022-06-06 12:49:10 -07:00
parent c40c65eecd
commit 96c721758e
4 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
.github/workflows/build-desktop.yml vendored
View File

@ -64,6 +64,7 @@ jobs:
runs-on: ubuntu-20.04
outputs:
package_version: ${{ steps.retrieve-version.outputs.package_version }}
release_channel: ${{ steps.release-channel.outputs.channel }}
build_number: ${{ steps.increment-version.outputs.build_number }}
rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
@ -87,6 +88,23 @@ jobs:
echo "Setting build number to $BUILD_NUMBER"
echo "::set-output name=build_number::$BUILD_NUMBER"
- name: Get Version Channel
id: release-channel
run: |
case "${{ steps.version.outputs.version }}" in
*"alpha"*)
echo "::set-output name=channel::alpha"
echo "[!] We do not yet support 'alpha'"
exit 1
;;
*"beta"*)
echo "::set-output name=channel::beta"
;;
*)
echo "::set-output name=channel::latest"
;;
esac
- name: Check if special branches exist
id: branch-check
run: |
@ -188,20 +206,11 @@ jobs:
path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x86_64.AppImage
if-no-files-found: error
- name: Upload beta auto-update artifact
- name: Upload auto-update artifact
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
if: endsWith(needs.setup.outputs.package_version, 'beta')
with:
name: beta-linux.yml
path: apps/desktop/dist/beta-linux.yml
if-no-files-found: error
- name: Upload latest auto-update artifact
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
if: ${{ !endsWith(needs.setup.outputs.package_version, 'beta') }}
with:
name: latest-linux.yml
path: apps/desktop/dist/latest-linux.yml
name: ${{ needs.setup.outputs.release_channel }}-linux.yml
path: apps/desktop/dist/${{ needs.setup.outputs.release_channel }}-linux.yml
if-no-files-found: error
@ -382,20 +391,11 @@ jobs:
path: apps/desktop/dist/chocolatey/bitwarden.${{ env._PACKAGE_VERSION }}.nupkg
if-no-files-found: error
- name: Upload beta auto-update artifact
- name: Upload auto-update artifact
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
if: endsWith(needs.setup.outputs.package_version, 'beta')
with:
name: beta.yml
path: apps/desktop/dist/nsis-web/beta.yml
if-no-files-found: error
- name: Upload latest auto-update artifact
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
if: ${{ !endsWith(needs.setup.outputs.package_version, 'beta') }}
with:
name: latest.yml
path: apps/desktop/dist/nsis-web/latest.yml
name: ${{ needs.setup.outputs.release_channel }}.yml
path: apps/desktop/dist/nsis-web/${{ needs.setup.outputs.release_channel }}.yml
if-no-files-found: error
@ -722,20 +722,11 @@ jobs:
path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-universal.dmg.blockmap
if-no-files-found: error
- name: Upload beta auto-update artifact
- name: Upload auto-update artifact
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
if: endsWith(needs.setup.outputs.package_version, 'beta')
with:
name: beta-mac.yml
path: apps/desktop/dist/beta-mac.yml
if-no-files-found: error
- name: Upload latest auto-update artifact
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
if: ${{ !endsWith(needs.setup.outputs.package_version, 'beta') }}
with:
name: latest-mac.yml
path: apps/desktop/dist/latest-mac.yml
name: ${{ needs.setup.outputs.release_channel }}-mac.yml
path: apps/desktop/dist/${{ needs.setup.outputs.release_channel }}-mac.yml
if-no-files-found: error

25
.github/workflows/release-desktop.yml vendored
View File

@ -23,6 +23,7 @@ jobs:
runs-on: ubuntu-20.04
outputs:
release-version: ${{ steps.version.outputs.version }}
release-channel: ${{ steps.release-channel.outputs.channel }}
branch-name: ${{ steps.branch.outputs.branch-name }}
steps:
- name: Branch check
@ -48,6 +49,23 @@ jobs:
monorepo: true
monorepo-project: desktop
- name: Get Version Channel
id: release-channel
run: |
case "${{ steps.version.outputs.version }}" in
*"alpha"*)
echo "::set-output name=channel::alpha"
echo "[!] We do not yet support 'alpha'"
exit 1
;;
*"beta"*)
echo "::set-output name=channel::beta"
;;
*)
echo "::set-output name=channel::latest"
;;
esac
- name: Get branch name
id: branch
run: |
@ -97,6 +115,7 @@ jobs:
uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09 # v2.8.5
env:
PKG_VERSION: ${{ steps.version.outputs.version }}
RELEASE_CHANNEL: ${{ steps.release-channel.outputs.channel }}
with:
artifacts: "apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-amd64.deb,
apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-x86_64.rpm,
@ -118,7 +137,10 @@ jobs:
apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal-mac.zip,
apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal.dmg,
apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal.dmg.blockmap,
apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive"
apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive,
apps/desktop/artifacts/${{ env.RELEASE_CHANNEL }}.yml,
apps/desktop/artifacts/${{ env.RELEASE_CHANNEL }}-linux.yml,
apps/desktop/artifacts/${{ env.RELEASE_CHANNEL }}-mac.yml"
commit: ${{ github.sha }}
tag: desktop-v${{ env.PKG_VERSION }}
name: Desktop v${{ env.PKG_VERSION }}
@ -126,6 +148,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
draft: true
snap:
name: Deploy Snap
runs-on: ubuntu-20.04

3
apps/desktop/electron-builder.json
View File

@ -9,6 +9,9 @@
"asarUnpack": ["**/*.node"],
"files": ["**/*", "!**/node_modules/@bitwarden/desktop-native/**/*"],
"electronVersion": "16.2.7",
"build": {
"generateUpdatesFilesForAllChannels": true
},
"publish": {
"provider": "generic",
"url": "https://artifacts.bitwarden.com/desktop"

3
package.json
View File

@ -12,9 +12,6 @@
"url": "https://github.com/bitwarden/clients/issues"
},
"homepage": "https://bitwarden.com",
"build": {
"generateUpdatesFilesForAllChannels": true
},
"scripts": {
"lint": "eslint . && prettier --check .",
"lint:fix": "eslint . --fix",