Skip to content

Commit 691de62

Browse files
authored
refactor(desktop): licenses (#183)
* refactor licenses pages * move licenses data loading to main state * update workflow
1 parent 6903f9b commit 691de62

29 files changed

Lines changed: 1035 additions & 20779 deletions

.github/workflows/release-nym-vpn-desktop.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,17 @@ jobs:
150150
- name: Prepare desktop build
151151
run: mkdir nym-vpn-desktop/dist
152152

153-
- name: Generate licenses file (Rust)
154-
run: |
155-
rm nym-vpn-desktop/public/licenses-rust.html || true
156-
make generate-licenses-desktop
157-
158153
- name: Generate licenses file (Js)
159154
working-directory: nym-vpn-desktop
160155
run: |
161156
rm public/licenses-js.json || true
162-
npm run gen:licenses
157+
npm run gen:licenses:js
158+
159+
- name: Generate licenses file (Rust)
160+
working-directory: nym-vpn-desktop
161+
run: |
162+
rm public/licenses-rust.json || true
163+
npm run gen:licenses:rust
163164
164165
- name: Install JS dependencies
165166
working-directory: nym-vpn-desktop

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ generate-licenses-cli:
5050
generate-licenses-cli-json:
5151
cargo about generate --all-features --format json -o all_licenses_cli.json
5252

53-
generate-licenses-desktop:
54-
cargo about generate --all-features -m $(DESKTOP_RUST_DIR)/Cargo.toml $(DESKTOP_RUST_DIR)/about.hbs -o $(DESKTOP_PUBLIC_DIR)/licenses-rust.html
55-
5653
generate-licenses-desktop-json:
5754
cargo about generate --all-features -m $(DESKTOP_RUST_DIR)/Cargo.toml --format json -o $(DESKTOP_PUBLIC_DIR)/licenses-rust.json
5855

nym-vpn-desktop/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ dist-ssr
2626
.cargo/
2727
yarn.lock
2828

29-
public/licenses-js.json
29+
public/licenses-*.json

0 commit comments

Comments
 (0)