diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 99307d3..e80f3a5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -71,7 +71,7 @@ jobs: if: ${{ startsWith(github.ref, 'refs/tags/') }} runs-on: ubuntu-latest needs: - - setup-matrix + - tarball steps: - uses: pnpm/action-setup@v2 with: @@ -80,26 +80,31 @@ jobs: - name: Prepare workspace run: rm -rf source-offline && mkdir source-offline - - name: Checkout GlobalProtect-openconnect - uses: actions/checkout@v3 + - name: Download tarball + uses: actions/download-artifact@v3 with: - token: ${{ secrets.GH_PAT }} - repository: yuezk/GlobalProtect-openconnect - ref: ${{ github.ref }} - path: source-offline/gp + name: artifact-source + path: source-offline - name: Create offline tarball run: | - cd source-offline/gp + cd source-offline + + offline_tarball=$(basename *.tar.gz .tar.gz).offline.tar.gz + + # Extract the tarball + tar -xzf *.tar.gz + + cd */ make tarball OFFLINE=1 # Rename the tarball to .offline.tar.gz - mv .build/tarball/*.tar.gz .build/tarball/$(basename .build/tarball/*.tar.gz .tar.gz).offline.tar.gz + mv -v .build/tarball/*.tar.gz ../$offline_tarball - name: Upload offline tarball uses: actions/upload-artifact@v3 with: - path: source-offline/gp/.build/tarball/*.tar.gz + path: source-offline/*.offline.tar.gz name: artifact-source-offline if-no-files-found: error diff --git a/Cargo.lock b/Cargo.lock index 151cd91..9d5037b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -581,7 +581,7 @@ dependencies = [ [[package]] name = "common" -version = "2.3.10" +version = "2.3.11" dependencies = [ "is_executable", ] @@ -1480,7 +1480,7 @@ dependencies = [ [[package]] name = "gpapi" -version = "2.3.10" +version = "2.3.11" dependencies = [ "anyhow", "base64 0.22.1", @@ -1517,7 +1517,7 @@ dependencies = [ [[package]] name = "gpauth" -version = "2.3.10" +version = "2.3.11" dependencies = [ "anyhow", "clap", @@ -1538,7 +1538,7 @@ dependencies = [ [[package]] name = "gpclient" -version = "2.3.10" +version = "2.3.11" dependencies = [ "anyhow", "clap", @@ -1560,7 +1560,7 @@ dependencies = [ [[package]] name = "gpgui-helper" -version = "2.3.10" +version = "2.3.11" dependencies = [ "anyhow", "clap", @@ -1578,7 +1578,7 @@ dependencies = [ [[package]] name = "gpservice" -version = "2.3.10" +version = "2.3.11" dependencies = [ "anyhow", "axum", @@ -2747,7 +2747,7 @@ dependencies = [ [[package]] name = "openconnect" -version = "2.3.10" +version = "2.3.11" dependencies = [ "cc", "common", diff --git a/Cargo.toml b/Cargo.toml index c4ec2b9..2d8384c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ [workspace.package] rust-version = "1.71.1" -version = "2.3.10" +version = "2.3.11" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2021" diff --git a/changelog.md b/changelog.md index d3741c3..373a0ed 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 2.3.11 - 2024-01-21 + +- Update minimal Rust version to 1.71.1, so that the PPA can be built on Ubuntu 18.04. + ## 2.3.10 - 2024-01-20 - Disconnect the VPN when sleep (fix [#166](https://github.com/yuezk/GlobalProtect-openconnect/issues/166), [#267](https://github.com/yuezk/GlobalProtect-openconnect/issues/267))