Compare commits

..
6 changed files with 26 additions and 33 deletions

No files matched your search

Generated
+10 -10
View File
@@ -214,7 +214,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]] [[package]]
name = "auth" name = "auth"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"block2", "block2",
@@ -423,7 +423,7 @@ dependencies = [
[[package]] [[package]]
name = "browser-launcher" name = "browser-launcher"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -719,7 +719,7 @@ dependencies = [
[[package]] [[package]]
name = "common" name = "common"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"tempfile", "tempfile",
] ]
@@ -1831,7 +1831,7 @@ dependencies = [
[[package]] [[package]]
name = "gpapi" name = "gpapi"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.22.1", "base64 0.22.1",
@@ -1882,7 +1882,7 @@ dependencies = [
[[package]] [[package]]
name = "gpauth" name = "gpauth"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auth", "auth",
@@ -1901,7 +1901,7 @@ dependencies = [
[[package]] [[package]]
name = "gpclient" name = "gpclient"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -1927,7 +1927,7 @@ dependencies = [
[[package]] [[package]]
name = "gpgui-helper" name = "gpgui-helper"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -1948,7 +1948,7 @@ dependencies = [
[[package]] [[package]]
name = "gphip" name = "gphip"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"askama", "askama",
@@ -1965,7 +1965,7 @@ dependencies = [
[[package]] [[package]]
name = "gpservice" name = "gpservice"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@@ -3386,7 +3386,7 @@ dependencies = [
[[package]] [[package]]
name = "openconnect" name = "openconnect"
version = "3.0.1" version = "3.0.0"
dependencies = [ dependencies = [
"autotools", "autotools",
"cc", "cc",
+1 -1
View File
@@ -11,7 +11,7 @@ members = [
[workspace.package] [workspace.package]
rust-version = "1.91" rust-version = "1.91"
version = "3.0.1" version = "3.0.0"
authors = ["Kevin Yue <[email protected]>"] authors = ["Kevin Yue <[email protected]>"]
homepage = "https://github.com/yuezk/GlobalProtect-openconnect" homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
edition = "2024" edition = "2024"
-11
View File
@@ -1,16 +1,5 @@
# Changelog # Changelog
## 3.0.1
### Fixed
- Fixed the bundled macOS CLI when launched through Homebrew.
- Fixed browser sign-in failures leaving the CLI waiting without an error.
- Fixed first-time startup on Linux and BSD when no system keyring is available.
- Improved tray menu behavior on Linux and BSD.
- Added clearer results when manually checking for updates.
- Improved desktop dialogs, settings, keyboard focus, and Linux window controls.
## 3.0.0 ## 3.0.0
### Added ### Added
Generated
+3 -3
View File
@@ -63,11 +63,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1791487292, "lastModified": 1791366222,
"narHash": "sha256-tqM7xDEsaeK1p6VvRygeZ9LkQRpUUkbRT02BHv6hnTM=", "narHash": "sha256-o0N4g6uSOIppU7CGToNvGlMf5vC+B6O6ukFHKY/TKOY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8edc0c72e3a38faf5434e40d1f19431125fe4b30", "rev": "39ad350a0602fa0a58a544344e3e9187526ea45c",
"type": "github" "type": "github"
}, },
"original": { "original": {
+6 -6
View File
@@ -29,8 +29,8 @@
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
pname = "globalprotect-openconnect"; pname = "globalprotect-openconnect";
version = cargoToml.workspace.package.version; version = cargoToml.workspace.package.version;
releaseTag = "v3.0.1"; releaseTag = "v3.0.0";
releaseVersion = "3.0.1"; releaseVersion = "3.0.0";
toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
@@ -55,8 +55,8 @@
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name; cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
gpguiHashes = { gpguiHashes = {
x86_64 = "sha256-lc05BKc0lu0qoZWmOPakjxXmenv1XoiQCOMIh5KE8A8="; x86_64 = "sha256-MdY+50LtG/AmJEcJdXbXFcvyl0R4jQMOmJfQ6rlAd6c=";
aarch64 = "sha256-bnmGQ82GJbS0z8yelMeOxzwSNV92iVk8hGEUUd4jkFA="; aarch64 = "sha256-a8/YtYQct6/UUjbNVDN/54fHxdnRFhKahprBLyVz0xk=";
}; };
gpguiArchive = pkgs.fetchurl { gpguiArchive = pkgs.fetchurl {
@@ -70,8 +70,8 @@
}; };
binaryHashes = { binaryHashes = {
x86_64 = "sha256-/nKUzhlIdlgK2Xpv2nCQ/tuwUCTYuoSSft7sCc/M7U0="; x86_64 = "sha256-/PsNsK2IY/qnsVQVF3o8EFnBRP9LpjxZm7e09d8/Xig=";
aarch64 = "sha256-pDJvHT8p6fMFtSyJypr/3wL/OPHK/TSL7HMt63nP5oQ="; aarch64 = "sha256-W51Ek28cA0mnE3G4d7DqhDAtvqmq17QQ+i155dxarUw=";
}; };
binaryArchive = pkgs.fetchurl { binaryArchive = pkgs.fetchurl {
+6 -2
View File
@@ -131,7 +131,6 @@ upload_file() {
} }
# Update the existing snapshot release in place to avoid notification spam. # Update the existing snapshot release in place to avoid notification spam.
# Keep its tag fixed; only release assets advance with subsequent builds.
# Preserve its macOS update assets when the current run does not replace them. # Preserve its macOS update assets when the current run does not replace them.
release_snapshot() { release_snapshot() {
mapfile -t files < <(release_assets) mapfile -t files < <(release_assets)
@@ -139,11 +138,14 @@ release_snapshot() {
local is_current local is_current
local asset local asset
local file local file
local snapshot_commit
snapshot_commit="$(git -C "$SCRIPT_DIR/.." rev-parse HEAD)"
if ! gh -R "$REPO" release view "$TAG" >/dev/null 2>&1; then if ! gh -R "$REPO" release view "$TAG" >/dev/null 2>&1; then
gh -R "$REPO" release create "$TAG" \ gh -R "$REPO" release create "$TAG" \
--prerelease=false \ --prerelease=false \
--latest=false \ --latest=false \
--target "$(git -C "$SCRIPT_DIR/.." rev-parse HEAD)" \ --target "$snapshot_commit" \
--title "Snapshot" \ --title "Snapshot" \
--notes "Rolling snapshot release from trusted CI builds." --notes "Rolling snapshot release from trusted CI builds."
fi fi
@@ -183,6 +185,8 @@ release_snapshot() {
fi fi
done <<<"$existing_assets" done <<<"$existing_assets"
gh api --method PATCH "repos/$REPO/git/refs/tags/$TAG" \
-f sha="$snapshot_commit" -F force=true >/dev/null
gh -R "$REPO" release edit "$TAG" --prerelease=false --latest=false --title "Snapshot" gh -R "$REPO" release edit "$TAG" --prerelease=false --latest=false --title "Snapshot"
} }