bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-13 14:53:33 +00:00
Code Issues Releases Wiki Activity

Update CLI storefronts to use bitwarden licensed artifacts (#9827)

Browse Source 
* Update the build job to use `bit` artifacts for stores

* Update the CLI's license in `package.json` for the NPM store

* Add license configuration to `snapcraft.yaml`
This commit is contained in:
Addison Beck
2024-06-26 16:01:05 -04:00
committed by GitHub
parent a3514001c0
commit 76a3cb5a46
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build-cli.yml vendored
View File

@@ -240,7 +240,7 @@ jobs:
- name: Package Chocolatey - name: Package Chocolatey
shell: pwsh shell: pwsh
if: ${{ matrix.license_type.prefix }} == 'oss' if: ${{ matrix.license_type.prefix }} == 'bit'
run: | run: |
Copy-Item -Path stores/chocolatey -Destination dist/chocolatey -Recurse Copy-Item -Path stores/chocolatey -Destination dist/chocolatey -Recurse
Copy-Item dist/${{ matrix.license_type.prefix }}/windows/bw.exe -Destination dist/chocolatey/tools Copy-Item dist/${{ matrix.license_type.prefix }}/windows/bw.exe -Destination dist/chocolatey/tools
@@ -282,7 +282,7 @@ jobs:
if-no-files-found: error if-no-files-found: error
- name: Upload Chocolatey asset - name: Upload Chocolatey asset
if: matrix.license_type.prefix == 'oss' if: matrix.license_type.prefix == 'bit'
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with: with:
name: bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg name: bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
@@ -290,7 +290,7 @@ jobs:
if-no-files-found: error if-no-files-found: error
- name: Upload NPM Build Directory asset - name: Upload NPM Build Directory asset
if: matrix.license_type.prefix == 'oss' if: matrix.license_type.prefix == 'bit'
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with: with:
name: bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip name: bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip
@@ -320,13 +320,13 @@ jobs:
- name: Get bw linux cli - name: Get bw linux cli
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4 uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
with: with:
name: bw-oss-linux-${{ env._PACKAGE_VERSION }}.zip name: bw-bit-linux-${{ env._PACKAGE_VERSION }}.zip
path: apps/cli/dist/snap path: apps/cli/dist/snap
- name: Rename snap artifact - name: Rename snap artifact
run: | run: |
cd dist/snap cd dist/snap
mv bw-oss-linux-${{ env._PACKAGE_VERSION }}.zip bw-linux-${{ env._PACKAGE_VERSION }}.zip mv bw-bit-linux-${{ env._PACKAGE_VERSION }}.zip bw-linux-${{ env._PACKAGE_VERSION }}.zip
- name: Setup Snap Package - name: Setup Snap Package
run: | run: |

2
apps/cli/package.json
View File

@@ -15,7 +15,7 @@
"type": "git", "type": "git",
"url": "https://github.com/bitwarden/clients" "url": "https://github.com/bitwarden/clients"
}, },
"license": "GPL-3.0-only", "license": "SEE LICENSE IN LICENSE.txt",
"scripts": { "scripts": {
"clean": "rimraf dist", "clean": "rimraf dist",
"build:oss": "webpack", "build:oss": "webpack",

1
apps/cli/stores/snap/snapcraft.yaml
View File

@@ -1,6 +1,7 @@
name: bw name: bw
version: __version__ version: __version__
summary: Bitwarden CLI - A secure and free password manager for all of your devices. summary: Bitwarden CLI - A secure and free password manager for all of your devices.
license: Proprietary
description: | description: |
Bitwarden, Inc. is the parent company of 8bit Solutions LLC. Bitwarden, Inc. is the parent company of 8bit Solutions LLC.