Skip to content

Commit

Permalink
Update CLI storefronts to use bitwarden licensed artifacts (#9827)
Browse files Browse the repository at this point in the history
* 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`
  • Loading branch information
addisonbeck authored Jun 26, 2024
1 parent a351400 commit 76a3cb5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ jobs:

- name: Package Chocolatey
shell: pwsh
if: ${{ matrix.license_type.prefix }} == 'oss'
if: ${{ matrix.license_type.prefix }} == 'bit'
run: |
Copy-Item -Path stores/chocolatey -Destination dist/chocolatey -Recurse
Copy-Item dist/${{ matrix.license_type.prefix }}/windows/bw.exe -Destination dist/chocolatey/tools
Expand Down Expand Up @@ -282,15 +282,15 @@ jobs:
if-no-files-found: error

- name: Upload Chocolatey asset
if: matrix.license_type.prefix == 'oss'
if: matrix.license_type.prefix == 'bit'
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
path: apps/cli/dist/chocolatey/bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
if-no-files-found: error

- 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
with:
name: bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip
Expand Down Expand Up @@ -320,13 +320,13 @@ jobs:
- name: Get bw linux cli
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
with:
name: bw-oss-linux-${{ env._PACKAGE_VERSION }}.zip
name: bw-bit-linux-${{ env._PACKAGE_VERSION }}.zip
path: apps/cli/dist/snap

- name: Rename snap artifact
run: |
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
run: |
Expand Down
2 changes: 1 addition & 1 deletion apps/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"type": "git",
"url": "https://github.com/bitwarden/clients"
},
"license": "GPL-3.0-only",
"license": "SEE LICENSE IN LICENSE.txt",
"scripts": {
"clean": "rimraf dist",
"build:oss": "webpack",
Expand Down
1 change: 1 addition & 0 deletions apps/cli/stores/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: bw
version: __version__
summary: Bitwarden CLI - A secure and free password manager for all of your devices.
license: Proprietary
description: |
Bitwarden, Inc. is the parent company of 8bit Solutions LLC.
Expand Down

0 comments on commit 76a3cb5

Please sign in to comment.