Make tarball

This commit is contained in:
Kevin Yue 2024-02-21 22:19:34 +08:00
parent 5404386972
commit cfdba00a01
3 changed files with 298 additions and 261 deletions

View File

@ -1,4 +1,4 @@
name: Build GPGUI name: Build
on: on:
push: push:
paths-ignore: paths-ignore:
@ -8,301 +8,325 @@ on:
- .devcontainer - .devcontainer
branches: branches:
- main - main
- dev
tags: tags:
- latest - latest
- v*.*.* - v*.*.*
jobs: jobs:
# Include arm64 if ref is a tag tarball:
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=[\"amd64\", \"arm64\"]" >> $GITHUB_OUTPUT
else
echo "matrix=[\"amd64\"]" >> $GITHUB_OUTPUT
fi
build-fe:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout gpgui repo
uses: actions/checkout@v3
with:
token: ${{ secrets.GH_PAT }}
repository: yuezk/gpgui
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 18
- uses: pnpm/action-setup@v2 - uses: pnpm/action-setup@v2
with: with:
version: 8 version: 8
- name: Checkout GlobalProtect-openconnect
- name: Install dependencies
run: |
cd app
pnpm install
- name: Build
run: |
cd app
pnpm run build
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: gpgui-fe
path: app/dist
build-tauri-amd64:
needs: [build-fe]
runs-on: ubuntu-latest
steps:
- name: Checkout gpgui repo
uses: actions/checkout@v3
with:
token: ${{ secrets.GH_PAT }}
repository: yuezk/gpgui
path: gpgui
- name: Checkout gp repo
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
token: ${{ secrets.GH_PAT }} token: ${{ secrets.GH_PAT }}
repository: yuezk/GlobalProtect-openconnect repository: yuezk/GlobalProtect-openconnect
path: gp path: gp
- name: Download gpgui-fe artifact
uses: actions/download-artifact@v3
with:
name: gpgui-fe
path: gpgui/app/dist
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
- name: Build Tauri in Docker
run: |
docker run \
--rm \
-v $(pwd):/${{ github.workspace }} \
-w ${{ github.workspace }} \
-e CI=true \
yuezk/gpdev:main \
"./gpgui/scripts/build.sh"
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: artifact-amd64-tauri
path: |
gpgui/.tmp/artifact
build-tauri-arm64:
if: startsWith(github.ref, 'refs/tags/')
needs: [build-fe]
runs-on: self-hosted
steps:
- name: Checkout gpgui repo
uses: actions/checkout@v3
with:
token: ${{ secrets.GH_PAT }}
repository: yuezk/gpgui
path: gpgui
- name: Checkout gp repo
uses: actions/checkout@v3
with:
token: ${{ secrets.GH_PAT }}
repository: yuezk/GlobalProtect-openconnect
path: gp
- name: Download gpgui-fe artifact
uses: actions/download-artifact@v3
with:
name: gpgui-fe
path: gpgui/app/dist
- name: Build Tauri
run: |
./gpgui/scripts/build.sh
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: artifact-arm64-tauri
path: |
gpgui/.tmp/artifact
package-tarball:
needs: [build-tauri-amd64, build-tauri-arm64]
runs-on: ubuntu-latest
steps:
- name: Checkout gpgui repo
uses: actions/checkout@v3
with:
token: ${{ secrets.GH_PAT }}
repository: yuezk/gpgui
path: gpgui
- name: Download artifact-amd64-tauri
uses: actions/download-artifact@v3
with:
name: artifact-amd64-tauri
path: gpgui/.tmp/artifact
- name: Download artifact-arm64-tauri
uses: actions/download-artifact@v3
with:
name: artifact-arm64-tauri
path: gpgui/.tmp/artifact
- name: Create tarball - name: Create tarball
run: | run: |
./gpgui/scripts/build-tarball.sh cd gp
make tarball
- name: Upload tarball - name: Upload tarball
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: artifact-tarball name: artifact-tarball
path: | path: |
gpgui/.tmp/tarball/*.tar.gz globalprotect-openconnect-*.tar.xz
package-rpm: # Include arm64 if ref is a tag
needs: [setup-matrix, package-tarball] # setup-matrix:
runs-on: ubuntu-latest # runs-on: ubuntu-latest
strategy: # outputs:
matrix: # matrix: ${{ steps.set-matrix.outputs.matrix }}
arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }} # steps:
steps: # - name: Set up matrix
- name: Checkout gpgui repo # id: set-matrix
uses: actions/checkout@v3 # run: |
with: # if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
token: ${{ secrets.GH_PAT }} # echo "matrix=[\"amd64\", \"arm64\"]" >> $GITHUB_OUTPUT
repository: yuezk/gpgui # else
path: gpgui # echo "matrix=[\"amd64\"]" >> $GITHUB_OUTPUT
# fi
- name: Download package tarball # build-fe:
uses: actions/download-artifact@v3 # runs-on: ubuntu-latest
with: # steps:
name: artifact-tarball # - name: Checkout gpgui repo
path: gpgui/.tmp/artifact # uses: actions/checkout@v3
# with:
# token: ${{ secrets.GH_PAT }}
# repository: yuezk/gpgui
- name: Set up QEMU # - name: Install Node.js
uses: docker/setup-qemu-action@v3 # uses: actions/setup-node@v4
with: # with:
platforms: ${{ matrix.arch }} # node-version: 18
- name: Login to Docker Hub # - uses: pnpm/action-setup@v2
uses: docker/login-action@v3 # with:
with: # version: 8
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
- name: Create RPM package # - name: Install dependencies
run: | # run: |
docker run \ # cd app
--rm \ # pnpm install
-v $(pwd):/${{ github.workspace }} \ # - name: Build
-w ${{ github.workspace }} \ # run: |
--platform linux/${{ matrix.arch }} \ # cd app
yuezk/gpdev:rpm-builder \ # pnpm run build
"./gpgui/scripts/build-rpm.sh"
- name: Upload rpm artifacts # - name: Upload artifacts
uses: actions/upload-artifact@v3 # uses: actions/upload-artifact@v3
with: # with:
name: artifact-${{ matrix.arch }}-rpm # name: gpgui-fe
path: | # path: app/dist
gpgui/.tmp/artifact/*.rpm
package-pkgbuild: # build-tauri-amd64:
needs: [setup-matrix, build-tauri-amd64, build-tauri-arm64] # needs: [build-fe]
runs-on: ubuntu-latest # runs-on: ubuntu-latest
strategy: # steps:
matrix: # - name: Checkout gpgui repo
arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }} # uses: actions/checkout@v3
steps: # with:
- name: Checkout gpgui repo # token: ${{ secrets.GH_PAT }}
uses: actions/checkout@v3 # repository: yuezk/gpgui
with: # path: gpgui
token: ${{ secrets.GH_PAT }}
repository: yuezk/gpgui
path: gpgui
- name: Download artifact-${{ matrix.arch }} # - name: Checkout gp repo
uses: actions/download-artifact@v3 # uses: actions/checkout@v3
with: # with:
name: artifact-${{ matrix.arch }}-tauri # token: ${{ secrets.GH_PAT }}
path: gpgui/.tmp/artifact # repository: yuezk/GlobalProtect-openconnect
# path: gp
- name: Set up QEMU # - name: Download gpgui-fe artifact
uses: docker/setup-qemu-action@v3 # uses: actions/download-artifact@v3
with: # with:
platforms: ${{ matrix.arch }} # name: gpgui-fe
# path: gpgui/app/dist
- name: Login to Docker Hub # - name: Login to Docker Hub
uses: docker/login-action@v3 # uses: docker/login-action@v3
with: # with:
username: ${{ secrets.DOCKER_HUB_USERNAME }} # username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }} # password: ${{ secrets.DOCKER_HUB_TOKEN }}
- name: Generate PKGBUILD # - name: Build Tauri in Docker
run: | # run: |
export CI_ARCH=${{ matrix.arch }} # docker run \
./gpgui/scripts/generate-pkgbuild.sh # --rm \
# -v $(pwd):/${{ github.workspace }} \
# -w ${{ github.workspace }} \
# -e CI=true \
# yuezk/gpdev:main \
# "./gpgui/scripts/build.sh"
- name: Build PKGBUILD package # - name: Upload artifacts
run: | # uses: actions/upload-artifact@v3
# Build package # with:
docker run \ # name: artifact-amd64-tauri
--rm \ # path: |
-v $(pwd)/gpgui/.tmp/pkgbuild:/pkgbuild \ # gpgui/.tmp/artifact
--platform linux/${{ matrix.arch }} \
yuezk/gpdev:pkgbuild
- name: Upload pkgbuild artifacts # build-tauri-arm64:
uses: actions/upload-artifact@v3 # if: startsWith(github.ref, 'refs/tags/')
with: # needs: [build-fe]
name: artifact-${{ matrix.arch }}-pkgbuild # runs-on: self-hosted
path: | # steps:
gpgui/.tmp/pkgbuild/*.pkg.tar.zst # - name: Checkout gpgui repo
# uses: actions/checkout@v3
# with:
# token: ${{ secrets.GH_PAT }}
# repository: yuezk/gpgui
# path: gpgui
gh-release: # - name: Checkout gp repo
if: startsWith(github.ref, 'refs/tags/') # uses: actions/checkout@v3
runs-on: ubuntu-latest # with:
needs: # token: ${{ secrets.GH_PAT }}
- package-rpm # repository: yuezk/GlobalProtect-openconnect
- package-pkgbuild # path: gp
steps: # - name: Download gpgui-fe artifact
- name: Download artifact # uses: actions/download-artifact@v3
uses: actions/download-artifact@v3 # with:
with: # name: gpgui-fe
path: artifact # path: gpgui/app/dist
# pattern: artifact-* # - name: Build Tauri
# merge-multiple: true # run: |
# ./gpgui/scripts/build.sh
# - name: Generate checksum # - name: Upload artifacts
# uses: jmgilman/actions-generate-checksum@v1 # uses: actions/upload-artifact@v3
# with: # with:
# output: checksums.txt # name: artifact-arm64-tauri
# patterns: | # path: |
# artifact/* # gpgui/.tmp/artifact
- name: Create GH release # package-tarball:
uses: softprops/action-gh-release@v1 # needs: [build-tauri-amd64, build-tauri-arm64]
with: # runs-on: ubuntu-latest
token: ${{ secrets.GH_PAT }} # steps:
prerelease: ${{ contains(github.ref, 'latest') }} # - name: Checkout gpgui repo
fail_on_unmatched_files: true # uses: actions/checkout@v3
files: | # with:
artifact/artifact-*/* # token: ${{ secrets.GH_PAT }}
# repository: yuezk/gpgui
# path: gpgui
# - name: Download artifact-amd64-tauri
# uses: actions/download-artifact@v3
# with:
# name: artifact-amd64-tauri
# path: gpgui/.tmp/artifact
# - name: Download artifact-arm64-tauri
# uses: actions/download-artifact@v3
# with:
# name: artifact-arm64-tauri
# path: gpgui/.tmp/artifact
# - name: Create tarball
# run: |
# ./gpgui/scripts/build-tarball.sh
# - name: Upload tarball
# uses: actions/upload-artifact@v3
# with:
# name: artifact-tarball
# path: |
# gpgui/.tmp/tarball/*.tar.gz
# package-rpm:
# needs: [setup-matrix, package-tarball]
# runs-on: ubuntu-latest
# strategy:
# matrix:
# arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
# steps:
# - name: Checkout gpgui repo
# uses: actions/checkout@v3
# with:
# token: ${{ secrets.GH_PAT }}
# repository: yuezk/gpgui
# path: gpgui
# - name: Download package tarball
# uses: actions/download-artifact@v3
# with:
# name: artifact-tarball
# path: gpgui/.tmp/artifact
# - name: Set up QEMU
# uses: docker/setup-qemu-action@v3
# with:
# platforms: ${{ matrix.arch }}
# - name: Login to Docker Hub
# uses: docker/login-action@v3
# with:
# username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }}
# - name: Create RPM package
# run: |
# docker run \
# --rm \
# -v $(pwd):/${{ github.workspace }} \
# -w ${{ github.workspace }} \
# --platform linux/${{ matrix.arch }} \
# yuezk/gpdev:rpm-builder \
# "./gpgui/scripts/build-rpm.sh"
# - name: Upload rpm artifacts
# uses: actions/upload-artifact@v3
# with:
# name: artifact-${{ matrix.arch }}-rpm
# path: |
# gpgui/.tmp/artifact/*.rpm
# package-pkgbuild:
# needs: [setup-matrix, build-tauri-amd64, build-tauri-arm64]
# runs-on: ubuntu-latest
# strategy:
# matrix:
# arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
# steps:
# - name: Checkout gpgui repo
# uses: actions/checkout@v3
# with:
# token: ${{ secrets.GH_PAT }}
# repository: yuezk/gpgui
# path: gpgui
# - name: Download artifact-${{ matrix.arch }}
# uses: actions/download-artifact@v3
# with:
# name: artifact-${{ matrix.arch }}-tauri
# path: gpgui/.tmp/artifact
# - name: Set up QEMU
# uses: docker/setup-qemu-action@v3
# with:
# platforms: ${{ matrix.arch }}
# - name: Login to Docker Hub
# uses: docker/login-action@v3
# with:
# username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }}
# - name: Generate PKGBUILD
# run: |
# export CI_ARCH=${{ matrix.arch }}
# ./gpgui/scripts/generate-pkgbuild.sh
# - name: Build PKGBUILD package
# run: |
# # Build package
# docker run \
# --rm \
# -v $(pwd)/gpgui/.tmp/pkgbuild:/pkgbuild \
# --platform linux/${{ matrix.arch }} \
# yuezk/gpdev:pkgbuild
# - name: Upload pkgbuild artifacts
# uses: actions/upload-artifact@v3
# with:
# name: artifact-${{ matrix.arch }}-pkgbuild
# path: |
# gpgui/.tmp/pkgbuild/*.pkg.tar.zst
# gh-release:
# if: startsWith(github.ref, 'refs/tags/')
# runs-on: ubuntu-latest
# needs:
# - package-rpm
# - package-pkgbuild
# steps:
# - name: Download artifact
# uses: actions/download-artifact@v3
# with:
# path: artifact
# # pattern: artifact-*
# # merge-multiple: true
# # - name: Generate checksum
# # uses: jmgilman/actions-generate-checksum@v1
# # with:
# # output: checksums.txt
# # patterns: |
# # artifact/*
# - name: Create GH release
# uses: softprops/action-gh-release@v1
# with:
# token: ${{ secrets.GH_PAT }}
# prerelease: ${{ contains(github.ref, 'latest') }}
# fail_on_unmatched_files: true
# files: |
# artifact/artifact-*/*

2
.gitignore vendored
View File

@ -3,3 +3,5 @@
.pnpm-store .pnpm-store
.env .env
vendor vendor
.cargo

View File

@ -1,3 +1,6 @@
VERSION=$(shell cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
PKG_NAME=globalprotect-openconnect-$(VERSION)
build: build-fe build-rs gpgui-helper build: build-fe build-rs gpgui-helper
build-fe: build-fe:
@ -9,6 +12,14 @@ build-rs:
gpgui-helper: gpgui-helper:
cargo build --release --frozen -p gpgui-helper --features "tauri/custom-protocol" cargo build --release --frozen -p gpgui-helper --features "tauri/custom-protocol"
tarball: build-fe
rm -rf apps/gpgui-helper/node_modules
mkdir -p .cargo
cargo vendor > .cargo/config.toml
tar --transform 's,^,${PKG_NAME}/,' -cJf ../${PKG_NAME}.tar.xz * .cargo
install: install:
install -Dm755 target/release/gpclient $(DESTDIR)/usr/bin/gpclient install -Dm755 target/release/gpclient $(DESTDIR)/usr/bin/gpclient
install -Dm755 target/release/gpauth $(DESTDIR)/usr/bin/gpauth install -Dm755 target/release/gpauth $(DESTDIR)/usr/bin/gpauth