From e9f9b926a1a3897b6179e92f429d3c5bba4a46dc Mon Sep 17 00:00:00 2001 From: zylquinal Date: Fri, 21 Jun 2024 17:16:20 +0700 Subject: [PATCH] 4.4.1-1 --- .github/workflows/main.yml | 41 ++++++++++++++++++++++++-------------- PKGBUILD | 30 ++++++++++++++++------------ build.sh | 17 ++++++++++++++++ 3 files changed, 60 insertions(+), 28 deletions(-) create mode 100644 build.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a7c5298..0756317 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,24 +1,35 @@ -name: PackageBuild +name: Package and Release -on: - push: - branches: - - master +on: [push] + +permissions: + contents: write jobs: build: runs-on: ubuntu-latest + steps: - - name: Checkout repository + - name: Checkout code uses: actions/checkout@v2 - - name: Build package - uses: heyhusen/archlinux-package-action@v2.2.1 - with: - aur: true - flags: '-s --noconfirm' - - name: Upload package + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Run Docker command + run: | + chmod +x build.sh + docker run --rm -v ${PWD}:/protonvpn-bin archlinux su - -c"/protonvpn-bin/build.sh" + + - name: Archive dist folder uses: actions/upload-artifact@v4 with: - name: package - path: ./*.pkg.tar.zst - retention-days: 90 + name: protonvpn-bin + path: protonvpn-bin-*.tar.zst + + - name: Create Release and Upload Asset + uses: softprops/action-gh-release@v2 + if: startsWith(github.ref, 'refs/tags/') + with: + tag_name: ${{ github.ref }} + files: ./protonvpn-bin-*.tar.zst \ No newline at end of file diff --git a/PKGBUILD b/PKGBUILD index 6a5c2e8..0ff655b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Zylquinal pkgname=protonvpn-bin -pkgver=4.3.2 +pkgver=4.4.1 pkgrel=1 pkgdesc="ProtonVPN for Linux" url="https://github.com/Zylquinal/protonvpn-bin" @@ -41,32 +41,36 @@ conflicts=('protonvpn' 'protonvpn-gui' ) -source=("https://repo.protonvpn.com/fedora-40-unstable/proton-vpn-gtk-app/proton-vpn-gtk-app-4.3.2-1.fc40.noarch.rpm" +source=("https://repo.protonvpn.com/fedora-40-unstable/proton-vpn-gtk-app/proton-vpn-gtk-app-4.4.1-1.fc40.noarch.rpm" "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-keyring-linux/python3-proton-keyring-linux-0.0.2-1.fc40.noarch.rpm" "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-keyring-linux-secretservice/python3-proton-keyring-linux-secretservice-0.0.2-1.fc40.noarch.rpm" - "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-api-core/python3-proton-vpn-api-core-0.24.4-1.fc40.noarch.rpm" - "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-connection/python3-proton-vpn-connection-0.14.4-1.fc40.noarch.rpm" - "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-killswitch/python3-proton-vpn-killswitch-0.4.0-1.fc40.noarch.rpm" - "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-killswitch-network-manager/python3-proton-vpn-killswitch-network-manager-0.4.4-1.fc40.noarch.rpm" + "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-api-core/python3-proton-vpn-api-core-0.26.2-1.fc40.noarch.rpm" + "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-connection/python3-proton-vpn-connection-0.16.0-1.fc40.noarch.rpm" + "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-killswitch/python3-proton-vpn-killswitch-0.5.0-1.fc40.noarch.rpm" + "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-killswitch-network-manager/python3-proton-vpn-killswitch-network-manager-0.4.5-1.fc40.noarch.rpm" + "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-killswitch-network-manager-wireguard/python3-proton-vpn-killswitch-network-manager-wireguard-0.0.5-1.fc40.noarch.rpm" "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-logger/python3-proton-vpn-logger-0.2.1-1.fc40.noarch.rpm" "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-network-manager/python3-proton-vpn-network-manager-0.4.2-1.fc40.noarch.rpm" "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-network-manager-openvpn/python3-proton-vpn-network-manager-openvpn-0.0.7-1.fc40.noarch.rpm" + "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-network-manager-wireguard/python3-proton-vpn-network-manager-wireguard-0.0.7-1.fc40.noarch.rpm" "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-vpn-session/python3-proton-vpn-session-0.6.7-1.fc40.noarch.rpm" - "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-core/python3-proton-core-0.1.18-1.fc40.noarch.rpm" + "https://repo.protonvpn.com/fedora-40-unstable/python3-proton-core/python3-proton-core-0.2.0-1.fc40.noarch.rpm" ) -sha256sums=('3e58f47ba0ee92a40384d53207c794dbeb4bf7ece42a898cfcef4d26c0fecfd7' +sha256sums=('98746876c97e8b11ec82c1a301f6aa8c311493c4a3373abe785857dbe0d97838' 'bfd2c4a4732b5411da5a6e528ae6b801dffdaaffb25678590b68046bc6441bca' '4fc57a770d29cc1331a6406b69116ec95ccfb80ca36c8c7a9a13935fda52eff6' - 'b1ad7f625cba55c80be7412ec6889c2f0557dd55525442efd8bfe31b86d07674' - 'b8814ea9d00baea4fbcecf1e52813eba591d746306d79ae8630dced4600e61cd' - '566f57fdd46b2835d5796ff1cfaedf7b208ed1185351b1b165c5ebba7762e104' - 'dece9c4da555c237b07c61d7b2cf5702da1e49a9e9d2dee73cf0f9e89c6dde36' + 'c58610cacbc4d2aa06d7944b36cb24edc276e2a4b9198c05cf1dc687cf3edde6' + '3fc97514641eeb1afe07353244dd23e4bb5b35fd995a2f10b7bca73bc3280528' + '3217de02b89978d73a94af4ac7a0ca07d48b9cdd31add7c088b90c69ebe9b48d' + '1299fe42738964973d3711d4d05fcca83ccbcc6a05c4d821f950407bca04d0fe' + '64c7cf662ac50778a615473a86e9eca19727c417ab606220bafd29c96f2c3e67' '8bfa9910f3bc19b3e962200693deac030a4214c1d332985273e668b2d0cf4105' '3cc3ae1af8fd38e8137376b9b55295658234ceba9301f61f32831be11342979a' 'bc69be8c1c8c9dfbe8852fa02bfbe68ff463d75eb511a9294bd841be998fc8d6' + 'a045d86a375eeff05189f77557a3a6de6fb8a8013bb71846949e1121ef79e952' '18ca68943e5b3d54116eedb0491eb01c96ce70b131926974380c693fa7bb780c' - '82f4c1026387e0af0c58fbf0bd2c65ad7a080f5f64898bfabc426fa1b57e1fc7') + 'bc6581a9e5a27a978376b7a1abef65d7758fa5f584a6e97899b4fed3c38abccd') package() { find $srcdir/ -mindepth 1 -maxdepth 1 -type d | xargs cp -r -t "$pkgdir" diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..47f606b --- /dev/null +++ b/build.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +pacman-key --init +pacman -Syu --noconfirm +pacman -S git sudo binutils debugedit fakeroot --noconfirm + +useradd -p "" -G wheel builder +echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +mkdir -p /home/builder/ +cp -a /protonvpn-bin /home/builder/ +chown -R builder:builder /home/builder/ + +cd /home/builder || exit 1 +cd protonvpn-bin || exit 1 + +su builder -c "makepkg -s --noconfirm" +sudo cp /home/builder/protonvpn-bin/*.pkg.tar.zst /protonvpn-bin/ \ No newline at end of file