From 6a1bb4ea1ebe97978c2a30b5c09c95241dc7fbba Mon Sep 17 00:00:00 2001
From: Marty Oehme <contact@martyoeh.me>
Date: Sat, 8 Mar 2025 16:22:56 +0100
Subject: [PATCH] Fix repo deployment workflow
---
.github/workflows/build.yaml | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0733409..72fad00 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -156,8 +156,6 @@ jobs:
sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
# install dependencies
xbps-install -Syu xbps && xbps-install -yu && xbps-install -y sudo bash curl git git-lfs
- # create non-root user
- useradd -G xbuilder -M builder
- name: Checkout existing repo
uses: actions/checkout@v4
@@ -165,6 +163,10 @@ jobs:
ref: gh-pages
lfs: true
+ - name: Remove any non-repo files
+ run: |
+ xbps-rindex --remove $PWD
+
- uses: actions/download-artifact@v4
with:
pattern: binaries-*
@@ -172,24 +174,27 @@ jobs:
- name: Show downloaded files
run: ls -R .
- - name: sign
+ - name: Sign package and repo
run: |
echo "${{ secrets.PRIV_KEY }}" > $HOME/privkey
xbps-rindex -s --signedby "${{ secrets.SIGNER }}" --privkey $HOME/privkey $PWD
- xbps-rindex -S --privkey $HOME/privkey $PWD/*.xbps
+ xbps-rindex -S --signedby "${{ secrets.SIGNER }}" --privkey $HOME/privkey $PWD/*.xbps
rm $HOME/privkey
- xbps-rindex -c $PWD
-
- - name: checksum
+ - name: Add package to repo
run: |
- for pkg in *.xbps; do sha256sum "$pkg" | tee "$pkg".sha256sum; done
- for pkg in *.xbps; do sha512sum "$pkg" | tee "$pkg".sha512sum; done
+ xbps-rindex --add $PWD/*.xbps
+ xbps-rindex --clean $PWD
+
+ # - name: checksum
+ # run: |
+ # for pkg in *.xbps; do sha256sum "$pkg" | tee "$pkg".sha256sum; done
+ # for pkg in *.xbps; do sha512sum "$pkg" | tee "$pkg".sha512sum; done
- name: Create simple index page for repo
run: |
- echo '<html><head><title>Index of /</title></head> <body><h1>Index of /</h1><hr><pre>' > index.html
- for pkg in *.xbps; do echo "<a href=\"${pkg}}\">${pkg}</a>" >> index.html; done
+ echo '<html><head><title>Custom void repository</title></head> <body><h1>Custom void repository. Index of /</h1><hr><pre>' > index.html
+ for pkg in *.xbps *.xbps.sig2; do echo "<a href=\"${pkg}}\">${pkg}</a>" >> index.html; done
echo '</body></html>' >> index.html
- name: publish to pages