From f129ca7ea142784ba69ac3f03dc8acf6ffebd140 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Fri, 8 May 2026 23:56:07 +0800 Subject: [PATCH] chore: release 2.5.4 --- .github/workflows/build.yaml | 58 ++++++++++++++++++++++ Cargo.lock | 16 +++--- Cargo.toml | 2 +- Makefile | 5 +- apps/gpgui-helper/src-tauri/src/updater.rs | 10 +++- changelog.md | 5 ++ 6 files changed, 83 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 989d90f..d06c9e2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -236,6 +236,63 @@ jobs: gpgui-source/*.bin.tar.xz gpgui-source/*.bin.tar.xz.sha256 + build-gpgui-musl: + needs: + - setup-matrix + strategy: + matrix: + os: ${{fromJson(needs.setup-matrix.outputs.matrix)}} + runs-on: ${{ matrix.os.runner }} + name: build-gpgui-musl (${{ matrix.os.arch }}) + steps: + - uses: pnpm/action-setup@v5 + with: + version: 9 + - name: Prepare workspace + run: rm -rf gpgui-source && mkdir gpgui-source + - name: Checkout GlobalProtect-openconnect + uses: actions/checkout@v6 + with: + token: ${{ secrets.GH_PAT }} + repository: yuezk/GlobalProtect-openconnect + ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref }} + path: gpgui-source/gp + submodules: recursive + - name: Checkout gpgui + uses: actions/checkout@v6 + with: + token: ${{ secrets.GH_PAT }} + repository: yuezk/gpgui + ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gpgui_branch || github.ref_name }} + path: gpgui-source/gpgui + - name: Tarball + run: | + cd gpgui-source + tar -czf gpgui.tar.gz gpgui gp + - name: Docker Login + run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin + - name: Build gpgui in Docker + run: | + docker run --pull=always --rm \ + -e COREPACK_INTEGRITY_KEYS=0 \ + -v $(pwd)/gpgui-source:/workspace yuezk/gpdev:gpgui-alpine-builder-tauri2 + - name: Install gpgui in Docker + run: | + cd gpgui-source + tar -xJf *.bin.tar.xz + docker run --pull=always --rm \ + -e COREPACK_INTEGRITY_KEYS=0 \ + -v $(pwd):/workspace yuezk/gpdev:gpgui-alpine-builder-tauri2 \ + bash -c "cd /workspace/gpgui_*/ && ./gpgui --version" + - name: Upload gpgui + uses: actions/upload-artifact@v7 + with: + name: artifact-gpgui-musl-${{ matrix.os.arch }} + if-no-files-found: error + path: | + gpgui-source/*.bin.tar.xz + gpgui-source/*.bin.tar.xz.sha256 + gh-release: if: ${{ github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/') }} runs-on: ubuntu-latest @@ -244,6 +301,7 @@ jobs: - tarball-offline - build-gp - build-gpgui + - build-gpgui-musl steps: - name: Prepare workspace diff --git a/Cargo.lock b/Cargo.lock index 3399902..7613e0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -203,7 +203,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auth" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "block2", @@ -652,7 +652,7 @@ dependencies = [ [[package]] name = "common" -version = "2.5.3" +version = "2.5.4" [[package]] name = "compile-time" @@ -1685,7 +1685,7 @@ dependencies = [ [[package]] name = "gpapi" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "base64 0.22.1", @@ -1728,7 +1728,7 @@ dependencies = [ [[package]] name = "gpauth" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "auth", @@ -1748,7 +1748,7 @@ dependencies = [ [[package]] name = "gpclient" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "askama", @@ -1775,7 +1775,7 @@ dependencies = [ [[package]] name = "gpgui-helper" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "clap", @@ -1793,7 +1793,7 @@ dependencies = [ [[package]] name = "gpservice" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "axum", @@ -3161,7 +3161,7 @@ dependencies = [ [[package]] name = "openconnect" -version = "2.5.3" +version = "2.5.4" dependencies = [ "autotools", "cc", diff --git a/Cargo.toml b/Cargo.toml index b3098ea..40c0e83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ [workspace.package] rust-version = "1.89" -version = "2.5.3" +version = "2.5.4" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2024" diff --git a/Makefile b/Makefile index 3aa479e..b816bd6 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ RUST_VERSION ?= 1.89 IGNORE_RUST_VERSION ?= 0 VERSION = $(shell grep '^version' Cargo.toml | head -1 | sed 's/version *= *"\(.*\)"/\1/') +GUI_LIBC_SUFFIX ?= $(shell ldd --version 2>&1 | grep -qi musl && echo -musl || true) REVISION ?= 1 RPM_SOURCE ?= %{name}.tar.gz @@ -77,8 +78,8 @@ download-gui: if [ $(INCLUDE_GUI) -eq 1 ]; then \ echo "Downloading GlobalProtect GUI..."; \ mkdir -p .build/gpgui; \ - curl -sSL https://github.com/yuezk/GlobalProtect-openconnect/releases/download/$(RELEASE_TAG)/gpgui_$(shell uname -m).bin.tar.xz \ - -o .build/gpgui/gpgui_$(shell uname -m).bin.tar.xz; \ + curl -sSL https://github.com/yuezk/GlobalProtect-openconnect/releases/download/$(RELEASE_TAG)/gpgui_$(shell uname -m)$(GUI_LIBC_SUFFIX).bin.tar.xz \ + -o .build/gpgui/gpgui_$(shell uname -m)$(GUI_LIBC_SUFFIX).bin.tar.xz; \ tar -xJf .build/gpgui/*.tar.xz -C .build/gpgui; \ else \ echo "Skipping GlobalProtect GUI download (INCLUDE_GUI=0)"; \ diff --git a/apps/gpgui-helper/src-tauri/src/updater.rs b/apps/gpgui-helper/src-tauri/src/updater.rs index bae2485..fb311ad 100644 --- a/apps/gpgui-helper/src-tauri/src/updater.rs +++ b/apps/gpgui-helper/src-tauri/src/updater.rs @@ -15,6 +15,12 @@ const SNAPSHOT: &str = match option_env!("SNAPSHOT") { None => "false", }; +#[cfg(target_env = "musl")] +const GUI_LIBC_SUFFIX: &str = "-musl"; + +#[cfg(not(target_env = "musl"))] +const GUI_LIBC_SUFFIX: &str = ""; + pub struct ProgressNotifier { win: WebviewWindow, } @@ -110,8 +116,8 @@ impl GuiUpdater { }; let file_url = format!( - "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/{}/gpgui_{}.bin.tar.xz", - release_tag, arch + "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/{}/gpgui_{}{}.bin.tar.xz", + release_tag, arch, GUI_LIBC_SUFFIX ); let checksum_url = format!("{}.sha256", file_url); diff --git a/changelog.md b/changelog.md index 8a5dc0e..341ab58 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # Changelog +## 2.5.4 - 2026-05-08 + +- Add Alpine/musl gpgui release assets for x86_64 and aarch64. +- Use the musl gpgui asset when the helper or package build runs on musl Linux. + ## 2.5.3 - 2026-05-08 - Fix systemd-resolved DNS routing when no split-DNS domains are provided (fix [#604](https://github.com/yuezk/GlobalProtect-openconnect/issues/604)).