Update build

This commit is contained in:
Kevin Yue 2024-02-25 18:34:52 +08:00
parent 354f50b671
commit d1ec358b8a
2 changed files with 14 additions and 9 deletions

View File

@ -130,7 +130,7 @@ jobs:
- name: Install PKGBUILD package - name: Install PKGBUILD package
run: | run: |
cd globalprotect-openconnect-*/ cd globalprotect-openconnect-*/
sudo pacman -U .build/pkgbuild/*.pkg.tar.zst sudo pacman -U --noconfirm .build/pkgbuild/*.pkg.tar.zst
gpclient --version gpclient --version
gpservice --version gpservice --version
@ -145,21 +145,22 @@ jobs:
binary: binary:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [tarball]
container: container:
image: yuezk/gpdev:main image: yuezk/gpdev:main
credentials: credentials:
username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
steps: steps:
- name: Checkout GlobalProtect-openconnect - name: Download tarball
uses: actions/checkout@v3 uses: actions/download-artifact@v3
with: with:
token: ${{ secrets.GH_PAT }} name: artifact-tarball
repository: yuezk/GlobalProtect-openconnect
path: gp
- name: Build binary using OFFLINE mode - name: Build binary using OFFLINE mode
run: | run: |
cd gp tar -xzf globalprotect-openconnect-*.tar.gz
cd globalprotect-openconnect-*/
make binary OFFLINE=1 make binary OFFLINE=1
- name: Install binary - name: Install binary
run: | run: |

View File

@ -63,6 +63,8 @@ build-fe:
fi fi
build-rs: build-rs:
printenv
if [ $(OFFLINE) -eq 1 ]; then \ if [ $(OFFLINE) -eq 1 ]; then \
tar -xJf vendor.tar.xz; \ tar -xJf vendor.tar.xz; \
fi fi
@ -135,7 +137,9 @@ deb: init-debian
dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements." dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements."
debuild --preserve-env -e PATH -us -uc -b printenv
debuild -e PATH -us -uc -b
check-ppa: check-ppa:
if [ $(OFFLINE) -eq 0 ]; then \ if [ $(OFFLINE) -eq 0 ]; then \
@ -183,7 +187,7 @@ rpm: init-rpm tarball
rm -rf $(HOME)/rpmbuild rm -rf $(HOME)/rpmbuild
rpmdev-setuptree rpmdev-setuptree
cp .build/tarball/${PKG}.tar.gz $(HOME)/rpmbuild/SOURCES cp .build/tarball/${PKG}.tar.gz $(HOME)/rpmbuild/SOURCES/${PKG_NAME}.tar.gz
rpmbuild -ba .build/rpm/globalprotect-openconnect.spec rpmbuild -ba .build/rpm/globalprotect-openconnect.spec
# Copy RPM package from build directory # Copy RPM package from build directory