Compare commits

...

7 Commits

Author SHA1 Message Date
Kevin Yue
ff43986085 Build pkg in docker 2024-02-26 01:07:50 -05:00
Kevin Yue
e04bb99d7a chown 2024-02-25 22:34:17 -05:00
Kevin Yue
7d0eddf50b chown 2024-02-25 22:28:27 -05:00
Kevin Yue
841bb29475 Use builder for arm64 2024-02-25 21:11:10 -05:00
Kevin Yue
42987841e3 Use builder for arm64 2024-02-25 21:06:26 -05:00
Kevin Yue
d25450fec4 Switch builder automatically 2024-02-25 20:41:06 -05:00
Kevin Yue
d0bc2f43ff Use builder user 2024-02-25 20:18:57 -05:00
4 changed files with 25 additions and 16 deletions

View File

@ -145,31 +145,38 @@ jobs:
matrix:
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
runs-on: ${{ matrix.os }}
container:
image: yuezk/gpdev:pkgbuild
credentials:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
# container:
# image: yuezk/gpdev:pkgbuild
# credentials:
# username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }}
steps:
- name: Download tarball
uses: actions/download-artifact@v3
with:
name: artifact-tarball
- name: Build PKGBUILD package
- name: Docker Login
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 pkgbuild BUILD_FE=0
- name: Install PKGBUILD package
make init-pkgbuild BUILD_FE=0
- name: Build PKGBUILD package in Docker
run: |
cd globalprotect-openconnect-*/
sudo pacman -U --noconfirm .build/pkgbuild/*.pkg.tar.zst
docker run --rm -v $(pwd)/.build/pkgbuild:/pkgbuild yuezk/gpdev:pkgbuild ./build.sh
- 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:

View File

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

View File

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

View File

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