From 0291506fbfd634900b9f6d87d480d18353356831 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 09:27:07 +0800 Subject: [PATCH 01/11] update PPA packaging --- .github/workflows/build.yml | 66 ++++++++----------------------------- 1 file changed, 13 insertions(+), 53 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0188d0e..a382f4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,64 +67,24 @@ jobs: with: name: snapshot-source-code path: artifacts - - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v4 - with: - gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }} - - name: Install dependencies - run: | - sudo apt update - sudo apt install debmake debhelper cmake \ - libqt5websockets5-dev qtbase5-dev qtwebengine5-dev - - - name: Build deb package for 18.04 + - name: Extract source code run: | cd $GITHUB_WORKSPACE/artifacts - mkdir build-18.04 - cp *.tar.gz build-18.04 && cd build-18.04 + mkdir deb-build + cp *.tar.gz deb-build && cd deb-build tar xf *.tar.gz - cd globalprotect-openconnect-*/ - - PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \ - PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 18.04 - - - name: Build deb package for 20.04 - run: | - cd $GITHUB_WORKSPACE/artifacts - mkdir build-20.04 - cp *.tar.gz build-20.04 && cd build-20.04 - tar xf *.tar.gz - cd globalprotect-openconnect-*/ - - PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \ - PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 20.04 - - - name: Build deb package for 21.04 - run: | - cd $GITHUB_WORKSPACE/artifacts - mkdir build-21.04 - cp *.tar.gz build-21.04 && cd build-21.04 - tar xf *.tar.gz - cd globalprotect-openconnect-*/ - - PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \ - PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 21.04 - - - name: Build deb package for 21.10 - run: | - cd $GITHUB_WORKSPACE/artifacts - mkdir build-21.10 - cp *.tar.gz build-21.10 && cd build-21.10 - tar xf *.tar.gz - cd globalprotect-openconnect-*/ - - PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \ - PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 21.10 + - name: Publish PPA + uses: yuezk/publish-ppa-package@develop + with: + repository: 'ppa:yuezk/globalprotect-openconnect-snapshot' + gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }} + gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }} + pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' + is_native: true + series: 'bionic focal' + snapshot-aur: if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }} needs: snapshot-archive-all From 9a01935f9fa2f459360cbd3a01f51aa947fa56ed Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 09:34:46 +0800 Subject: [PATCH 02/11] remove empty line --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d0149fe..8c9698a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.4 +1.3.4 \ No newline at end of file From f5a060991c5c45ac60bbb3fb74e2f4fef9790eac Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 02:34:04 +0800 Subject: [PATCH 03/11] update CI workflow --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a382f4d..6448c03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,6 +51,8 @@ jobs: - name: Archive all run: | ./scripts/snapshot-archive-all.sh + echo "${{ secrets.PPA_GPG_PRIVATE_KEY }}" > ./artifacts/private.gpg + echo "${{ secrets.PPA_GPG_PASSPHRASE }}" > ./artifacts/passphrase.txt - uses: actions/upload-artifact@v2 with: From 1316b81e8712e105def874b484032c7e9e28b77a Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 12:18:03 +0800 Subject: [PATCH 04/11] update action --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6448c03..a382f4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,8 +51,6 @@ jobs: - name: Archive all run: | ./scripts/snapshot-archive-all.sh - echo "${{ secrets.PPA_GPG_PRIVATE_KEY }}" > ./artifacts/private.gpg - echo "${{ secrets.PPA_GPG_PASSPHRASE }}" > ./artifacts/passphrase.txt - uses: actions/upload-artifact@v2 with: From a27e9364b4dcbf6b1e1f162e6eed7f94112a08a9 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 13:06:14 +0800 Subject: [PATCH 05/11] use native package --- debian/source/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) From 52cfaa5512462e963c586a760eed1ab65251dece Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 13:37:41 +0800 Subject: [PATCH 06/11] update PPA packaging --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a382f4d..8728a0b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,7 @@ jobs: gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }} pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' is_native: true - series: 'bionic focal' + series: 'bionic focal hirsute impish' snapshot-aur: if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }} From ba7a0cb29cbae07523cc7b7ef69f50474f6cbee4 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 14:21:17 +0800 Subject: [PATCH 07/11] update PPA packaging --- .github/workflows/build.yml | 2 +- debian/source/format | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8728a0b..13227f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }} gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }} pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' - is_native: true + is_native: false series: 'bionic focal hirsute impish' snapshot-aur: diff --git a/debian/source/format b/debian/source/format index 89ae9db..46ebe02 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) \ No newline at end of file From 45943588f4860823a727d2d33069157953f6bab5 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 14:28:38 +0800 Subject: [PATCH 08/11] update PPA packaging --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13227f8..58de817 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,6 @@ jobs: gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }} gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }} pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' - is_native: false series: 'bionic focal hirsute impish' snapshot-aur: From 674489387c34cc6e1403c6d67a840568e1f389f7 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 16:51:07 +0800 Subject: [PATCH 09/11] update PPA packaging --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58de817..ecb8e3b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,8 +71,7 @@ jobs: - name: Extract source code run: | cd $GITHUB_WORKSPACE/artifacts - mkdir deb-build - cp *.tar.gz deb-build && cd deb-build + mkdir deb-build && cp *.tar.gz deb-build && cd deb-build tar xf *.tar.gz - name: Publish PPA @@ -82,7 +81,6 @@ jobs: gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }} gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }} pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' - series: 'bionic focal hirsute impish' snapshot-aur: if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }} From 44c8243a10ba0a9bccbec66c9a3f0c5871d5d84c Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 17:16:11 +0800 Subject: [PATCH 10/11] update PPA packaging --- debian/source/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/source/format b/debian/source/format index 46ebe02..9f67427 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) \ No newline at end of file +3.0 (native) \ No newline at end of file From 76941a5624b23ae07f98a81c0e96b4e3f9c70cab Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 25 Oct 2021 17:29:31 +0800 Subject: [PATCH 11/11] update PPA packaging --- .github/workflows/build.yml | 65 +++++++------------------------------ 1 file changed, 11 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecb8e3b..53e1ec9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -191,62 +191,19 @@ jobs: name: release-source-code path: artifacts - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v4 + - name: Extract source code + run: | + cd $GITHUB_WORKSPACE/artifacts + mkdir deb-build && cp *.tar.gz deb-build && cd deb-build + tar xf *.tar.gz + + - name: Publish PPA + uses: yuezk/publish-ppa-package@develop with: + repository: 'ppa:yuezk/globalprotect-openconnect' gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }} - - - name: Install dependencies - run: | - sudo apt update - sudo apt install debmake debhelper cmake \ - libqt5websockets5-dev qtbase5-dev qtwebengine5-dev - - - name: Build deb package for 18.04 - run: | - cd $GITHUB_WORKSPACE/artifacts - mkdir build-18.04 - cp *.tar.gz build-18.04 && cd build-18.04 - tar xf *.tar.gz - cd globalprotect-openconnect-*/ - - PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \ - PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 18.04 --stable - - - name: Build deb package for 20.04 - run: | - cd $GITHUB_WORKSPACE/artifacts - mkdir build-20.04 - cp *.tar.gz build-20.04 && cd build-20.04 - tar xf *.tar.gz - cd globalprotect-openconnect-*/ - - PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \ - PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 20.04 --stable - - - name: Build deb package for 21.04 - run: | - cd $GITHUB_WORKSPACE/artifacts - mkdir build-21.04 - cp *.tar.gz build-21.04 && cd build-21.04 - tar xf *.tar.gz - cd globalprotect-openconnect-*/ - - PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \ - PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 21.04 --stable - - - name: Build deb package for 21.10 - run: | - cd $GITHUB_WORKSPACE/artifacts - mkdir build-21.10 - cp *.tar.gz build-21.10 && cd build-21.10 - tar xf *.tar.gz - cd globalprotect-openconnect-*/ - - PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \ - PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 21.10 --stable + gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }} + pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' release-aur: if: startsWith(github.ref, 'refs/tags/v')