.github/workflows/build.yaml

@@ -145,38 +145,31 @@ jobs:
       matrix:
         os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
     runs-on: ${{ matrix.os }}
-    # container:
+    container:
-    #   image: yuezk/gpdev:pkgbuild
+      image: yuezk/gpdev:pkgbuild
-    #   credentials:
+      credentials:
-    #     username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-    #     password: ${{ secrets.DOCKER_HUB_TOKEN }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
     steps:
     - name: Download tarball
       uses: actions/download-artifact@v3
       with:
         name: artifact-tarball
-    - name: Docker Login
+    - name: Build PKGBUILD package
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-    - name: Init PKGBUILD package
       run: |
         tar -xzf globalprotect-openconnect-*.tar.gz
         cd globalprotect-openconnect-*/
 
-        make init-pkgbuild BUILD_FE=0
+        make pkgbuild BUILD_FE=0
-    - name: Build PKGBUILD package in Docker
+    - name: Install PKGBUILD package
       run: |
         cd globalprotect-openconnect-*/
-        docker run --rm -v $(pwd)/.build/pkgbuild:/pkgbuild yuezk/gpdev:pkgbuild ./build.sh
+        sudo pacman -U --noconfirm .build/pkgbuild/*.pkg.tar.zst
-
-    - name: Install PKGBUILD package in Docker
-      run: |
-        cd globalprotect-openconnect-*/
-
-        docker run \
-          --rm -v $(pwd)/.build/pkgbuild:/pkgbuild \
-          yuezk/gpdev:pkgbuild \
-          bash -c "sudo pacman -U --noconfirm /pkgbuild/*.pkg.tar.zst; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
 
+        gpclient --version
+        gpservice --version
+        gpauth --version
+        gpgui-helper --version
     - name: Upload PKGBUILD package
       uses: actions/upload-artifact@v3
       with:

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