diff --git a/.github/workflows/update-repo.yml b/.github/workflows/update-repo.yml index 2101615..54a1ee8 100644 --- a/.github/workflows/update-repo.yml +++ b/.github/workflows/update-repo.yml @@ -1,4 +1,4 @@ -name: Update Arch Repository (Binary Sigs) +name: Update Arch Repository on: push: @@ -8,7 +8,7 @@ on: jobs: build-and-deploy: - runs-on: local + runs-on: local # Ensure your runner has the 'local:host' label steps: - name: Checkout code @@ -24,14 +24,13 @@ jobs: rm -f hyprarch-repo.db* hyprarch-repo.files* mkdir -p db_temp - # We still use --armor for the public key (that's for humans) gpg --export --armor 236328A7F2C2001E > pubkey.gpg for pkg in *.pkg.tar.zst; do - # 1. Create BINARY detached signature (REMOVED --armor) + # Create BINARY detached signature echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --pinentry-mode loopback --local-user 236328A7F2C2001E --passphrase-fd 0 --detach-sign --output "$pkg.sig" "$pkg" - # 2. Extract Metadata + # Extract Metadata pkgname=$(bsdtar -xOf "$pkg" .PKGINFO | grep "^pkgname =" | cut -d' ' -f3 | tr -d '\r') pkgver=$(bsdtar -xOf "$pkg" .PKGINFO | grep "^pkgver =" | cut -d' ' -f3 | tr -d '\r') pkgdesc=$(bsdtar -xOf "$pkg" .PKGINFO | grep "^pkgdesc =" | cut -d' ' -f3- | sed "s/['\"]//g" | tr -d '\r') @@ -40,7 +39,6 @@ jobs: mkdir -p "db_temp/$pkgname-$pkgver" - # 3. Build 'desc' with internal PGP SIG (Base64 of the binary sig) { echo "%NAME%"; echo "$pkgname"; echo "" echo "%VERSION%"; echo "$pkgver"; echo "" @@ -55,7 +53,6 @@ jobs: } > "db_temp/$pkgname-$pkgver/desc" done - # 4. Pack and Sign DB (Signatures here should also be binary) cd db_temp tar --owner=0 --group=0 -c * | gzip -n -9 > ../hyprarch-repo.db.tar.gz cd .. @@ -64,9 +61,35 @@ jobs: echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --pinentry-mode loopback --local-user 236328A7F2C2001E --passphrase-fd 0 --detach-sign --output hyprarch-repo.db.sig hyprarch-repo.db rm -rf db_temp - - name: Deploy + - name: Generate Landing Page run: | - sudo mkdir -p /var/www/hyprarch-repo/x86_64 - sudo cp -rf . /var/www/hyprarch-repo/ - sudo chown -R www-data:www-data /var/www/hyprarch-repo - sudo chmod -R 755 /var/www/hyprarch-repo \ No newline at end of file + cat < index.html + + + + HyprArch Repo + + + +
+

🚀 HyprArch Pi Repository

+ 
curl -s https://repo.stuple.net/x86_64/pubkey.gpg | sudo pacman-key -a - && sudo pacman-key --lsign-key 236328A7F2C2001E
+ 
[hyprarch-repo]
+          SigLevel = Required DatabaseOptional
+          Server = https://repo.stuple.net/\$arch
+

📂 Browse File Index

+
+ + + EOF + + - name: Deploy to Local Web Folder + run: | + # Since stui now owns the folder, we don't need sudo here + mkdir -p /var/www/hyprarch-repo/x86_64 + cp -rf . /var/www/hyprarch-repo/ \ No newline at end of file