Merge remote-tracking branch 'upstream/master'

Author: ipitio

.github/workflows/manual.yml

@@ -30,7 +30,7 @@ env:
 jobs:
   update:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' }}
 
     permissions:
       contents: write
@@ -64,13 +64,18 @@ jobs:
           fileName: "*.zst"
           tarBall: false
           zipBall: false
+          out-file-path: ".bkg"
 
       - name: Dry run
         id: update
         run: |
+          set +e
           docker run -v $PWD:/app --env-file <(env | grep GITHUB) \
             ghcr.io/$GITHUB_OWNER/$GITHUB_REPO:master \
-            src/test/update.sh; echo "updated=$?" >> "$GITHUB_OUTPUT"
+            src/test/update.sh bkg
+          code=$?
+          echo "updated=$code" >> "$GITHUB_OUTPUT"
+          exit "$code"
 
       - name: Get date
         id: date
@@ -80,8 +85,8 @@ jobs:
         if: ${{ steps.update.outputs.updated == '0' }}
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "*.zst"
-          bodyFile: "CHANGELOG.md"
+          artifacts: "bkg/*.zst"
+          bodyFile: "bkg/CHANGELOG.md"
           tag: "v${{ steps.date.outputs.tag }}"
           commit: "master"
           allowUpdates: true

.github/workflows/update.yml

@@ -56,13 +56,18 @@ jobs:
           fileName: "*.zst"
           tarBall: false
           zipBall: false
+          out-file-path: ".bkg"
 
       - name: Dry run
         id: update
         run: |
+          set +e
           docker run -v $PWD:/app --env-file <(env | grep GITHUB) \
             ghcr.io/ipitio/backage:master \
-            src/test/update.sh; echo "updated=$?" >> "$GITHUB_OUTPUT"
+            src/test/update.sh bkg
+          code=$?
+          echo "updated=$code" >> "$GITHUB_OUTPUT"
+          exit "$code"
 
       - name: Get date
         id: date
@@ -72,8 +77,8 @@ jobs:
         if: ${{ steps.update.outputs.updated == '0' }}
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "*.zst"
-          bodyFile: "CHANGELOG.md"
+          artifacts: "bkg/*.zst"
+          bodyFile: "bkg/CHANGELOG.md"
           tag: "v${{ steps.date.outputs.tag }}"
           commit: "master"
           allowUpdates: true

.gitignore

@@ -1,2 +1,3 @@
 index/
 index.db*
+*.db*

README.md

@@ -28,7 +28,7 @@ Otherwise, if this is a fork, you'd prefer an alternative method, or your packag
 > [!TIP]
 > You only need to add names to the queue; IDs are fetched as needed and entries are removed once processed.
 
-New packages won't be added until *all* existing ones are refreshed; you should also create an independent instance that'll update faster and more frequently. Simply fork just the `master` branch, choose one of the following options, and use the [Alternative URL](#alternative-url) when it changes. This centralized repo will then serve as a backup for all subsets of packages not in `optout.txt`.
+New packages may not be added until *all* existing ones are refreshed; you should also create an independent instance that'll update faster and more frequently. Simply fork just the `master` branch, choose one of the following options, and use the [Alternative URL](#alternative-url) when it changes. This centralized repo will then serve as a backup for all subsets of packages not in `optout.txt`.
 
 > [!IMPORTANT]
 > Your own packages will be picked up automatically! If you need to edit `owners.txt`, do so after the first run.
@@ -49,12 +49,7 @@ This will use a lot of minutes on GitHub-hosted runners, so you may want to use
 This is an example for `systemd`; adapt it to your needs. Please note:
 
 - Docker needs to be installed
-- You don't need to set `GITHUB_TOKEN` if you first log in with `gh` or use your PAT to run:
-
-```bash
-git clone --depth=1 -b master --single-branch [https|ssh]://<PAT>@github.com/pkgforge-dev/backage /opt/backage/master
-```
-
+- You don't need to set `GITHUB_TOKEN` if you first log in with `gh`
 - `-m 0` ensures only the public packages of the owners you've added are updated (default)
   - You'll need the proper permissions to update private packages
 - `-d 0` allows everything to be updated in one go
@@ -74,7 +69,7 @@ ExecStart=/usr/bin/sh -c '                   \\
   GITHUB_TOKEN=<PAT>                        ;\\
   GITHUB_OWNER=<username>                   ;\\
   GITHUB_REPO=backage                       ;\\
-  GITHUB_BRANCH=                      ;\\
+  GITHUB_BRANCH=master                      ;\\
   BKG_PATH=\$GITHUB_REPO/\$GITHUB_BRANCH    ;\\
   mkdir -p /opt/\$BKG_PATH                  ;\\
   docker run -v /opt/\$BKG_PATH:/app         \\