Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
t-aleksander committed Oct 31, 2024
2 parents fa9e2c6 + ac7eaa0 commit 25208d0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ To learn more about the system see our [documentation](https://docs.defguard.net
Make sure to install prerequisites from [tauri](https://tauri.app/v1/guides/getting-started/prerequisites/).

### Proto submodule

Make sure you have cloned, and up to date, proto submodule in `src-tauri/proto`

### Protoc compiler

Make sure you have [protoc](https://grpc.io/docs/protoc-installation/) available.

### Install pnpm and node deps
Expand Down Expand Up @@ -59,9 +61,11 @@ pnpm tauri dev
```

### Build command

```bash
pnpm tauri build
```

Built packages are available after in `src-tauri/target/release/bundle`.

### Windows
Expand All @@ -75,6 +79,7 @@ Remove `default-run` line from `[package]` section in `Cargo.toml` to build the
</p>

# Legal

WireGuard® is [registered trademarks](https://www.wireguard.com/trademark-policy/) of Jason A. Donenfeld.

# Known issues
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "defguard-client",
"private": false,
"version": "0.5.0",
"version": "1.0.0",
"type": "module",
"scripts": {
"dev": "npm-run-all --parallel vite typesafe-i18n",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "defguard-client",
"version": "0.5.0"
"version": "1.0.0"
},
"tauri": {
"systemTray": {
Expand Down

0 comments on commit 25208d0

Please sign in to comment.