Upload release

.github/workflows/build.yaml

@@ -13,234 +13,216 @@ on:
       - latest
       - v*.*.*
 jobs:
-  # Include arm64 if ref is a tag
-  setup-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Set up matrix
-        id: set-matrix
-        run: |
-          if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
-            echo "matrix=[\"ubuntu-latest\", \"arm64\"]" >> $GITHUB_OUTPUT
-          else
-            echo "matrix=[\"ubuntu-latest\"]" >> $GITHUB_OUTPUT
-          fi
-
   tarball:
     runs-on: ubuntu-latest
-    needs: [setup-matrix]
     steps:
     - uses: pnpm/action-setup@v2
       with:
         version: 8
-    - name: Prepare workspace
-      run: rm -rf source && mkdir source
     - name: Checkout GlobalProtect-openconnect
       uses: actions/checkout@v3
       with:
         token: ${{ secrets.GH_PAT }}
         repository: yuezk/GlobalProtect-openconnect
-        path: source/gp
+        path: gp
     - name: Create tarball
       run: |
-        cd source/gp
+        cd gp
         make tarball
     - name: Upload tarball
       uses: actions/upload-artifact@v3
       with:
-        name: artifact-source
+        name: artifact-tarball
         if-no-files-found: error
         path: |
-          source/gp/.build/tarball/*.tar.gz
+          gp/.build/tarball/*.tar.gz
 
   build-deb:
-    needs:
+    runs-on: ubuntu-latest
-    - setup-matrix
+    needs: [tarball]
-    - tarball
+    container:
-    strategy:
+      image: yuezk/gpdev:main
-      matrix:
+      credentials:
-        os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-    runs-on: ${{ matrix.os }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
     steps:
-    - name: Prepare workspace
-      run: rm -rf build-deb && mkdir build-deb
     - name: Download tarball
       uses: actions/download-artifact@v3
       with:
-        name: artifact-source
+        name: artifact-tarball
-        path: build-deb
+    - name: Build DEB package
-    - name: Docker Login
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-    - name: Build DEB package in Docker
       run: |
-        docker run --rm -v $(pwd)/build-deb:/deb yuezk/gpdev:deb-builder
+        tar -xzf *.tar.gz
-    - name: Install DEB package in Docker
+        cd globalprotect-openconnect-*
+
+        make deb BUILD_FE=0
+    - name: Install DEB package
       run: |
-        docker run --rm -v $(pwd)/build-deb:/deb yuezk/gpdev:deb-builder \
+        cd globalprotect-openconnect-*/
-          bash -c "sudo dpkg -i /deb/*.deb; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
+        sudo dpkg -i .build/deb/*.deb
+
+        gpclient --version
+        gpservice --version
+        gpauth --version
+        gpgui-helper --version
     - name: Upload DEB package
       uses: actions/upload-artifact@v3
       with:
-        name: artifact-deb-${{ matrix.os }}
+        name: artifact-deb
         if-no-files-found: error
         path: |
-          build-deb/*.deb
+          globalprotect-openconnect-*/.build/deb/*.deb
 
   build-rpm:
-    needs:
+    runs-on: ubuntu-latest
-    - setup-matrix
+    needs: [tarball]
-    - tarball
+    container:
-    strategy:
+      image: yuezk/gpdev:rpm-builder
-      matrix:
+      credentials:
-        os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-    runs-on: ${{ matrix.os }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
     steps:
-    - name: Prepare workspace
-      run: rm -rf build-rpm && mkdir build-rpm
     - name: Download tarball
       uses: actions/download-artifact@v3
       with:
-        name: artifact-source
+        name: artifact-tarball
-        path: build-rpm
+    - name: Build RPM package
-    - name: Docker Login
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-    - name: Build RPM package in Docker
       run: |
-        docker run --rm -v $(pwd)/build-rpm:/rpm yuezk/gpdev:rpm-builder
+        tar -xzf globalprotect-openconnect-*.tar.gz
-    - name: Install RPM package in Docker
+        cd globalprotect-openconnect-*/
+
+        make rpm BUILD_FE=0
+    - name: Install RPM package
       run: |
-        docker run --rm -v $(pwd)/build-rpm:/rpm yuezk/gpdev:rpm-builder \
+        cd globalprotect-openconnect-*/
-          bash -c "sudo rpm -i /rpm/*.$(uname -m).rpm; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
+        ls -l .build/rpm
+        sudo rpm -i ".build/rpm/globalprotect-openconnect*.$(uname -m).rpm"
+
+        gpclient --version
+        gpservice --version
+        gpauth --version
+        gpgui-helper --version
+
     - name: Upload RPM package
       uses: actions/upload-artifact@v3
       with:
-        name: artifact-rpm-${{ matrix.os }}
+        name: artifact-rpm
         if-no-files-found: error
         path: |
-          build-rpm/*.rpm
+          globalprotect-openconnect-*/.build/rpm/*.rpm
 
   build-pkgbuild:
-    needs:
+    runs-on: ubuntu-latest
-    - setup-matrix
+    needs: [tarball]
-    - tarball
+    container:
-    strategy:
+      image: yuezk/gpdev:pkgbuild
-      matrix:
+      credentials:
-        os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-    runs-on: ${{ matrix.os }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
     steps:
-    - name: Prepare workspace
-      run: rm -rf build-pkgbuild && mkdir build-pkgbuild
     - name: Download tarball
       uses: actions/download-artifact@v3
       with:
-        name: artifact-source
+        name: artifact-tarball
-        path: build-pkgbuild
+    - name: Build PKGBUILD package
-    - name: Docker Login
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-    - name: Build PKGBUILD package in Docker
       run: |
-        docker run --rm -v $(pwd)/build-pkgbuild:/pkgbuild yuezk/gpdev:pkgbuild
+        tar -xzf globalprotect-openconnect-*.tar.gz
-    - name: Install PKGBUILD package in Docker
+        cd globalprotect-openconnect-*/
+
+        make pkgbuild BUILD_FE=0
+    - name: Install PKGBUILD package
       run: |
-        docker run --rm -v $(pwd)/build-pkgbuild:/pkgbuild yuezk/gpdev:pkgbuild \
+        cd globalprotect-openconnect-*/
-          bash -c "sudo pacman -U --noconfirm /pkgbuild/*.pkg.tar.zst; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
+        sudo pacman -U --noconfirm .build/pkgbuild/*.pkg.tar.zst
+
+        gpclient --version
+        gpservice --version
+        gpauth --version
+        gpgui-helper --version
     - name: Upload PKGBUILD package
       uses: actions/upload-artifact@v3
       with:
-        name: artifact-pkgbuild-${{ matrix.os }}
+        name: artifact-pkgbuild
         if-no-files-found: error
         path: |
-          build-pkgbuild/*.pkg.tar.zst
+          globalprotect-openconnect-*/.build/pkgbuild/*.pkg.tar.zst
 
   build-binary:
-    needs:
+    runs-on: ubuntu-latest
-    - setup-matrix
+    needs: [tarball]
-    - tarball
+    container:
-    strategy:
+      image: yuezk/gpdev:main
-      matrix:
+      credentials:
-        os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-    runs-on: ${{ matrix.os }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
     steps:
-    - name: Prepare workspace
+      - name: Download tarball
-      run: rm -rf build-binary && mkdir build-binary
+        uses: actions/download-artifact@v3
-    - name: Download tarball
+        with:
-      uses: actions/download-artifact@v3
+          name: artifact-tarball
-      with:
+      - name: Build binary using OFFLINE mode
-        name: artifact-source
+        run: |
-        path: build-binary
+          tar -xzf globalprotect-openconnect-*.tar.gz
-    - name: Docker Login
+          cd globalprotect-openconnect-*/
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+
-    - name: Build binary in Docker
+          make binary OFFLINE=1
-      run: |
+      - name: Install binary
-        docker run --rm -v $(pwd)/build-binary:/binary yuezk/gpdev:binary-builder
+        run: |
-    - name: Install binary in Docker
+          cd globalprotect-openconnect-*/
-      run: |
+          cd .build/binary/globalprotect-openconnect_*_$(uname -m)
-        cd build-binary
+
-        tar -xJf ./*.bin.tar.xz
+          sudo make install
-        docker run --rm -v $(pwd):/binary yuezk/gpdev:binary-builder \
+          gpclient --version
-          bash -c "cd /binary/globalprotect-openconnect*/ && sudo make install && gpclient --version && gpservice --version && gpauth --version && gpgui-helper --version;"
+          gpservice --version
-    - name: Upload binary
+          gpauth --version
-      uses: actions/upload-artifact@v3
+          gpgui-helper --version
-      with:
+      - name: Upload binary
-        name: artifact-binary-${{ matrix.os }}
+        uses: actions/upload-artifact@v3
-        if-no-files-found: error
+        with:
-        path: |
+          name: artifact-binary
-          build-binary/*.bin.tar.xz
+          if-no-files-found: error
-          build-binary/*.bin.tar.xz.sha256
+          path: |
+            globalprotect-openconnect-*/.build/binary/*.bin.tar.xz*
 
   build-gpgui:
-    needs:
+    runs-on: ubuntu-latest
-    - setup-matrix
+    container:
-    strategy:
+      image: yuezk/gpdev:main
-      matrix:
+      credentials:
-        os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-    runs-on: ${{ matrix.os }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
     steps:
     - uses: pnpm/action-setup@v2
       with:
         version: 8
-    - name: Prepare workspace
-      run: rm -rf gpgui-source && mkdir gpgui-source
     - name: Checkout GlobalProtect-openconnect
       uses: actions/checkout@v3
       with:
         token: ${{ secrets.GH_PAT }}
         repository: yuezk/GlobalProtect-openconnect
-        path: gpgui-source/gp
+        path: gp
     - name: Checkout gpgui
       uses: actions/checkout@v3
       with:
         token: ${{ secrets.GH_PAT }}
         repository: yuezk/gpgui
-        path: gpgui-source/gpgui
+        path: gpgui
-    - name: Tarball
+    - name: Build gpgui
       run: |
-        cd gpgui-source
+        cd gpgui
-        tar -czf gpgui.tar.gz gpgui gp
+        make package
-    - name: Docker Login
+
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+        ./target/release/gpgui --version
-    - name: Build gpgui in Docker
-      run: |
-        docker run --rm -v $(pwd)/gpgui-source:/gpgui yuezk/gpdev:gpgui-builder
-    - name: Install gpgui in Docker
-      run: |
-        cd gpgui-source
-        tar -xJf *.bin.tar.xz
-        docker run --rm -v $(pwd):/gpgui yuezk/gpdev:gpgui-builder \
-          bash -c "cd /gpgui/gpgui_*/ && ./gpgui --version"
     - name: Upload gpgui
       uses: actions/upload-artifact@v3
       with:
-        name: artifact-gpgui-${{ matrix.os }}
+        name: artifact-gpgui
         if-no-files-found: error
         path: |
-          gpgui-source/*.bin.tar.xz
+          gpgui/.build/package/*.tar.xz*
-          gpgui-source/*.bin.tar.xz.sha256
 
   gh-release:
-    if: startsWith(github.ref, 'refs/tags/')
+    # if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     needs:
       - build-deb
@@ -250,17 +232,22 @@ jobs:
       - build-gpgui
 
     steps:
-    - name: Prepare workspace
+      - name: Download all artifacts
-      run: rm -rf build-artifact && mkdir build-artifact
+        uses: actions/download-artifact@v3
-    - name: Download all artifacts
+        with:
-      uses: actions/download-artifact@v3
+          path: artifact
-      with:
+
-        path: build-artifact
+      - name: Create GH release
-    - name: Create GH release
+        uses: softprops/action-gh-release@v1
-      uses: softprops/action-gh-release@v1
+        with:
-      with:
+          token: ${{ secrets.GH_PAT }}
-        token: ${{ secrets.GH_PAT }}
+          # prerelease: ${{ contains(github.ref, 'latest') }}
-        prerelease: ${{ contains(github.ref, 'latest') }}
+          prerelease: true
-        fail_on_unmatched_files: true
+          fail_on_unmatched_files: true
-        files: |
+          files: |
-          build-artifact/artifact-*/*
+            artifact/**/*.deb
+            artifact/**/*.rpm
+            artifact/**/*.pkg.tar.zst
+            artifact/**/*.bin.tar.xz
+            artifact/**/*.tar.gz
+            artifact/**/*.sha256

Cargo.lock

@@ -1423,7 +1423,7 @@ dependencies = [
 
 [[package]]
 name = "gpapi"
-version = "2.1.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "base64 0.21.5",
@@ -1455,7 +1455,7 @@ dependencies = [
 
 [[package]]
 name = "gpauth"
-version = "2.1.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -1475,7 +1475,7 @@ dependencies = [
 
 [[package]]
 name = "gpclient"
-version = "2.1.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -1496,7 +1496,7 @@ dependencies = [
 
 [[package]]
 name = "gpgui-helper"
-version = "2.1.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -1514,7 +1514,7 @@ dependencies = [
 
 [[package]]
 name = "gpservice"
-version = "2.1.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -2519,7 +2519,7 @@ dependencies = [
 
 [[package]]
 name = "openconnect"
-version = "2.1.0"
+version = "2.0.0"
 dependencies = [
  "cc",
  "is_executable",

Cargo.toml

@@ -5,7 +5,7 @@ members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/g
 
 [workspace.package]
 rust-version = "1.70"
-version = "2.1.0"
+version = "2.0.0"
 authors = ["Kevin Yue <k3vinyue@gmail.com>"]
 homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
 edition = "2021"

Makefile

@@ -220,15 +220,15 @@ binary: clean-binary tarball
 	cp .build/tarball/${PKG}.tar.gz .build/binary
 	tar -xzf .build/binary/${PKG}.tar.gz -C .build/binary
 
-	mkdir -p .build/binary/$(PKG_NAME)_$(VERSION)/artifacts
+	mkdir -p .build/binary/$(PKG_NAME)_$(VERSION)_$(shell uname -m)/artifacts
 
-	make -C .build/binary/${PKG} build OFFLINE=$(OFFLINE) BUILD_FE=0
+	make -C .build/binary/${PKG} build OFFLINE=$(OFFLINE)
-	make -C .build/binary/${PKG} install DESTDIR=$(PWD)/.build/binary/$(PKG_NAME)_$(VERSION)/artifacts
+	make -C .build/binary/${PKG} install DESTDIR=$(PWD)/.build/binary/$(PKG_NAME)_$(VERSION)_$(shell uname -m)/artifacts
 
-	cp packaging/binary/Makefile.in .build/binary/$(PKG_NAME)_$(VERSION)/Makefile
+	cp packaging/binary/Makefile.in .build/binary/$(PKG_NAME)_$(VERSION)_$(shell uname -m)/Makefile
 
 	# Create a tarball for the binary package
-	tar -cJf .build/binary/$(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz -C .build/binary $(PKG_NAME)_$(VERSION)
+	tar -cJf .build/binary/$(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz -C .build/binary $(PKG_NAME)_$(VERSION)_$(shell uname -m)
 
 	# Generate sha256sum
 	cd .build/binary && sha256sum $(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz | cut -d' ' -f1 > $(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz.sha256

apps/gpgui-helper/src-tauri/src/updater.rs

@@ -80,19 +80,14 @@ impl GuiUpdater {
   pub async fn update(&self) {
     info!("Update GUI, version: {}", self.version);
 
-    #[cfg(debug_assertions)]
-    let release_tag = "latest";
-    #[cfg(not(debug_assertions))]
-    let release_tag = format!("v{}", self.version);
-
     #[cfg(target_arch = "x86_64")]
     let arch = "x86_64";
     #[cfg(target_arch = "aarch64")]
     let arch = "aarch64";
 
     let file_url = format!(
-      "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/{}/gpgui_{}_{}.bin.tar.xz",
+      "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v{}/gpgui_{}_{}.bin.tar.xz",
-      release_tag, self.version, arch
+      self.version, self.version, arch
     );
     let checksum_url = format!("{}.sha256", file_url);
 

changelog.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## 2.1.0 - 2024-02-27
-
-- Update distribution channel for `gpgui` to complaint with the GPL-3 license.
-- Add `mtu` option.
-- Retry auth if failed to obtain the auth cookie
-
 ## 2.0.0 - 2024-02-05
 
 - Refactor using Tauri

packaging/deb/rules

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export OFFLINE = @OFFLINE@ BUILD_FE=0
+export OFFLINE = @OFFLINE@
 
 %:
 	dh $@

packaging/pkgbuild/PKGBUILD.in

@@ -25,7 +25,7 @@ build() {
   # Must unset the CFLAGS, otherwise the build fails
   unset CFLAGS
 
-  make build OFFLINE=@OFFLINE@ BUILD_FE=0
+  make build OFFLINE=@OFFLINE@
 }
 
 package() {

packaging/rpm/globalprotect-openconnect.spec.in

@@ -35,9 +35,7 @@ A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authenticati
 %setup
 
 %build
-# The injected RUSTFLAGS could fail the build
+make build OFFLINE=@OFFLINE@
-unset RUSTFLAGS
-make build OFFLINE=@OFFLINE@ BUILD_FE=0
 
 %install
 %make_install