From e01d47c799203eca897397ef0963ccf33e68c0c6 Mon Sep 17 00:00:00 2001 From: leon3s Date: Mon, 2 Sep 2024 06:27:26 +0200 Subject: [PATCH 1/4] release: 0.1.4 stable --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6a784a..872f081 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Switch from zenity to polkit for authentication +- Switch from zenity to polkit for authentication by [@CD11b](https://github.com/CD11b) ## [0.1.3] - 2024-08-04 From 012c87da428dd9eaa5e2b303027f5160daf16810 Mon Sep 17 00:00:00 2001 From: leon3s Date: Tue, 3 Sep 2024 11:27:33 +0200 Subject: [PATCH 2/4] fix: added libwebkit in dependencies and enabled verbose in arm build --- .github/workflows/draft_stable_arm.yml | 4 ++-- LICENSE-MIT | 2 +- src-tauri/Cargo.lock | 8 ++++---- src-tauri/tauri.conf.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/draft_stable_arm.yml b/.github/workflows/draft_stable_arm.yml index ad08318..5153165 100644 --- a/.github/workflows/draft_stable_arm.yml +++ b/.github/workflows/draft_stable_arm.yml @@ -79,11 +79,11 @@ jobs: npm install next@latest react@latest react-dom@latest eslint-config-next@latest # Install build tools and tauri-cli requirements apt-get install -y libwebkit2gtk-4.0-dev build-essential wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev - cargo install tauri-cli + # cargo install tauri-cli # Install frontend dependencies npm install # Build the application - cargo tauri build + npm run tauri build -- --verbose - name: Test if release already exists id: release-exists diff --git a/LICENSE-MIT b/LICENSE-MIT index 5c5bbcf..647bc4b 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2023-2024 Wireguard GUI Contributors +Copyright (c) 2024-2025 Wireguard GUI Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 15e2462..708b903 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -222,9 +222,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", @@ -3998,9 +3998,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.16.9" +version = "0.16.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" +checksum = "48d298c441a1da46e28e8ad8ec205aab7fd8cd71b9d10e05454224eef422e1ae" dependencies = [ "bitflags 1.3.2", "cairo-rs", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 38868a3..dba1aa5 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -21,9 +21,9 @@ "bundle": { "active": true, "category": "Utility", - "copyright": "Copyright (c) 2023-2024 Wireguard GUI Contributors", + "copyright": "Copyright (c) 2024-2025 Wireguard GUI Contributors", "deb": { - "depends": [] + "depends": ["libwebkit2gtk-4.0-37"] }, "externalBin": [], "icon": [ From d1126a05dd325c681cfec950e4ce351cc411f817 Mon Sep 17 00:00:00 2001 From: leon3s Date: Tue, 3 Sep 2024 11:38:18 +0200 Subject: [PATCH 3/4] fix: release workflow --- .github/workflows/draft_stable.yml | 4 ++-- .github/workflows/draft_stable_arm.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/draft_stable.yml b/.github/workflows/draft_stable.yml index 0f60fdf..a9fc1b1 100644 --- a/.github/workflows/draft_stable.yml +++ b/.github/workflows/draft_stable.yml @@ -76,7 +76,7 @@ jobs: run: | gh release create -d \ $VERSION-$CHANNEL \ - -t -$VERSION-$CHANNEL \ + -t $VERSION-$CHANNEL \ -F ./CHANGELOG.md \ ./src-tauri/target/release/bundle/deb/wireguard-gui_${VERSION}_amd64.deb#wireguard-gui_amd64.deb \ ./src-tauri/target/release/bundle/appimage/wireguard-gui_${VERSION}_amd64.AppImage#wireguard-gui_amd64.AppImage @@ -87,7 +87,7 @@ jobs: run: | gh release delete-asset -y \ $VERSION-$CHANNEL \ - /wireguard-gui_${VERSION}_amd64.deb || true + wireguard-gui_${VERSION}_amd64.deb || true gh release delete-asset -y \ $VERSION-$CHANNEL \ wireguard-gui_${VERSION}_amd64.AppImage|| true diff --git a/.github/workflows/draft_stable_arm.yml b/.github/workflows/draft_stable_arm.yml index 5153165..243291c 100644 --- a/.github/workflows/draft_stable_arm.yml +++ b/.github/workflows/draft_stable_arm.yml @@ -78,7 +78,7 @@ jobs: apt-get install -y nodejs npm install next@latest react@latest react-dom@latest eslint-config-next@latest # Install build tools and tauri-cli requirements - apt-get install -y libwebkit2gtk-4.0-dev build-essential wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt install libdbus-1-dev libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev # cargo install tauri-cli # Install frontend dependencies npm install @@ -96,7 +96,7 @@ jobs: run: | gh release create -d \ $VERSION-$CHANNEL \ - -t -$VERSION-$CHANNEL \ + -t $VERSION-$CHANNEL \ -F ./CHANGELOG.md \ ./src-tauri/target/release/bundle/deb/wireguard-gui_${VERSION}_arm64.deb#wireguard-gui_arm64.deb \ ./src-tauri/target/release/bundle/appimage/wireguard-gui_${VERSION}_arm64.AppImage#wireguard-gui_arm64.AppImage @@ -108,7 +108,7 @@ jobs: run: | gh release delete-asset -y \ $VERSION-$CHANNEL \ - /wireguard-gui_${VERSION}_arm64.deb || true + wireguard-gui_${VERSION}_arm64.deb || true gh release delete-asset -y \ $VERSION-$CHANNEL \ wireguard-gui_${VERSION}_arm64.AppImage|| true From 8df7d2a1eaf56811b4ee7dbe5b615b8e88b859b0 Mon Sep 17 00:00:00 2001 From: leon3s Date: Tue, 3 Sep 2024 12:22:48 +0200 Subject: [PATCH 4/4] fix: release workflow --- .github/workflows/draft_stable_arm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draft_stable_arm.yml b/.github/workflows/draft_stable_arm.yml index 243291c..00b35d5 100644 --- a/.github/workflows/draft_stable_arm.yml +++ b/.github/workflows/draft_stable_arm.yml @@ -78,7 +78,7 @@ jobs: apt-get install -y nodejs npm install next@latest react@latest react-dom@latest eslint-config-next@latest # Install build tools and tauri-cli requirements - sudo apt install libdbus-1-dev libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt install -f libdbus-1-dev libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev # cargo install tauri-cli # Install frontend dependencies npm install