diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8374157..b69e64d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -134,7 +134,7 @@ jobs: matrix: # Only build gp on amd64, as the arm64 package will be built in release.yaml os: [{runner: ubuntu-latest, arch: amd64}] - package: [deb, rpm, pkg, binary] + package: [deb, rpm, pkg, binary, ubuntu-rolling] runs-on: ${{ matrix.os.runner }} name: build-gp (${{ matrix.package }}, ${{ matrix.os.arch }}) steps: @@ -153,14 +153,14 @@ jobs: run: | docker run --pull=always --rm \ -e COREPACK_INTEGRITY_KEYS=0 \ - -v $(pwd)/build-gp-${{ matrix.package }}:/${{ matrix.package }} \ + -v $(pwd)/build-gp-${{ matrix.package }}:/workspace \ yuezk/gpdev:${{ matrix.package }}-builder-tauri2 - name: Install ${{ matrix.package }} package in Docker run: | docker run --pull=always --rm \ -e COREPACK_INTEGRITY_KEYS=0 \ -e GPGUI_INSTALLED=0 \ - -v $(pwd)/build-gp-${{ matrix.package }}:/${{ matrix.package }} \ + -v $(pwd)/build-gp-${{ matrix.package }}:/workspace \ yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \ bash install.sh - name: Upload ${{ matrix.package }} package diff --git a/.github/workflows/publish-ppa.yaml b/.github/workflows/publish-ppa.yaml index 9934dd1..a9011d2 100644 --- a/.github/workflows/publish-ppa.yaml +++ b/.github/workflows/publish-ppa.yaml @@ -79,8 +79,8 @@ jobs: sed -i "s/@BUILD_GUI@/1/g" .build/debian/rules # Update the control file with the correct Rust version - sed -i "s/rust-[0-9.]\+-all/rust-${{ inputs.rust }}-all/g" .build/debian/control - sed -i "s/rust-[0-9.]\+/rust-${{ inputs.rust }}/g" .build/debian/rules + # sed -i "s/rust-[0-9.]\+-all/rust-${{ inputs.rust }}-all/g" .build/debian/control + # sed -i "s/rust-[0-9.]\+/rust-${{ inputs.rust }}/g" .build/debian/rules sed -i "s/DISABLE_RUST_TOOLCHAIN = 0/DISABLE_RUST_TOOLCHAIN = 1/g" .build/debian/rules - name: Publish to PPA diff --git a/Makefile b/Makefile index 65b1d06..2ec4637 100644 --- a/Makefile +++ b/Makefile @@ -188,7 +188,6 @@ init-debian: clean-debian tarball # Remove the GUI dependencies if BUILD_GUI is set to 0 if [ $(BUILD_GUI) -eq 0 ]; then \ - sed -i "/libxml2/d" .build/deb/$(PKG)/debian/control; \ sed -i "/libsecret-1-0/d" .build/deb/$(PKG)/debian/control; \ sed -i "/libayatana-appindicator3-1/d" .build/deb/$(PKG)/debian/control; \ sed -i "/gnome-keyring/d" .build/deb/$(PKG)/debian/control; \ diff --git a/packaging/deb/control.in b/packaging/deb/control.in index d3f7af9..b41b323 100644 --- a/packaging/deb/control.in +++ b/packaging/deb/control.in @@ -8,13 +8,12 @@ Build-Depends: debhelper (>= 9), jq (>= 1), make (>= 4), libssl-dev, - libxml2, libsecret-1-0, libayatana-appindicator3-1, gnome-keyring, libwebkit2gtk-4.1-dev, libopenconnect-dev (>= 8.20), - rust-1.82-all + rust-1.82-all | rust-1.85-all Homepage: https://github.com/yuezk/GlobalProtect-openconnect Package: globalprotect-openconnect @@ -23,7 +22,6 @@ Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends}, openconnect (>=8.20), - libxml2, libsecret-1-0, libayatana-appindicator3-1, gnome-keyring, diff --git a/packaging/deb/rules.in b/packaging/deb/rules.in index 2ca7a71..2de4274 100755 --- a/packaging/deb/rules.in +++ b/packaging/deb/rules.in @@ -5,7 +5,7 @@ export BUILD_FE = 0 export BUILD_GUI = @BUILD_GUI@ export DISABLE_RUST_TOOLCHAIN = 0 -export PATH := /usr/lib/rust-1.82/bin:$(PATH) +export PATH := /usr/lib/rust-1.82/bin:/usr/lib/rust-1.85/bin:$(PATH) %: which cargo diff --git a/packaging/pkgbuild/PKGBUILD.in b/packaging/pkgbuild/PKGBUILD.in index ee76297..361d11d 100644 --- a/packaging/pkgbuild/PKGBUILD.in +++ b/packaging/pkgbuild/PKGBUILD.in @@ -9,7 +9,7 @@ arch=('x86_64' 'aarch64') url="https://github.com/yuezk/GlobalProtect-openconnect" license=('GPL3') makedepends=('make' 'pkg-config' 'rust' 'cargo' 'jq' 'webkit2gtk-4.1' 'curl' 'wget' 'file' 'openssl' 'appmenu-gtk-module' 'libappindicator-gtk3' 'librsvg' 'openconnect' 'libsecret') -depends=('openconnect>=8.20' webkit2gtk-4.1 libappindicator-gtk3 libsecret libxml2) +depends=('openconnect>=8.20' webkit2gtk-4.1 libappindicator-gtk3 libsecret) optdepends=('wmctrl: for window management') provides=('globalprotect-openconnect' 'gpclient' 'gpservice' 'gpauth' 'gpgui')