simplify workflows, update badges

ipitio · Dec 2, 2024 · d2c1a10 · d2c1a10
1 parent 3bf89d2
commit d2c1a10
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 34 deletions.
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -64,17 +64,7 @@ jobs:
 
       - name: Get date
         id: date
-        run: |
-          echo "date=$(date -u +%Y-%m-%d)" >> "$GITHUB_OUTPUT"
-          echo "tag=$(date -u +%-Y.%-m).$((($(date -u +%-d)-1)/7))" >> "$GITHUB_OUTPUT"
-
-      - name: Save state
-        id: commit
-        if: ${{ steps.update.outputs.updated == '0' }}
-        uses: EndBug/add-and-commit@v9
-        with:
-          add: "-- *.txt README.md"
-          message: "${{ steps.date.outputs.date }}"
+        run: echo "tag=$(date -u +%-Y.%-m).$((($(date -u +%-d)-1)/7))" >> "$GITHUB_OUTPUT"
 
       - name: Save database
         if: ${{ steps.update.outputs.updated == '0' }}

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -2,7 +2,7 @@ name: update
 
 on:
   schedule:
-    - cron: "* */3 * * *"
+    - cron: "* */5 * * *"
 
 concurrency:
   group: ${{ github.ref }}
@@ -56,17 +56,7 @@ jobs:
 
       - name: Get date
         id: date
-        run: |
-          echo "date=$(date -u +%Y-%m-%d)" >> "$GITHUB_OUTPUT"
-          echo "tag=$(date -u +%-Y.%-m).$((($(date -u +%-d)-1)/7))" >> "$GITHUB_OUTPUT"
-
-      - name: Save state
-        id: commit
-        if: ${{ steps.update.outputs.updated == '0' }}
-        uses: EndBug/add-and-commit@v9
-        with:
-          add: "-- *.txt README.md"
-          message: "${{ steps.date.outputs.date }}"
+        run: echo "tag=$(date -u +%-Y.%-m).$((($(date -u +%-d)-1)/7))" >> "$GITHUB_OUTPUT"
 
       - name: Save database
         if: ${{ steps.update.outputs.updated == '0' }}

diff --git a/README.md b/README.md
@@ -8,11 +8,11 @@
 
 ---
 
-[![build](https://github.com/ipitio/backage/actions/workflows/publish.yml/badge.svg)](https://github.com/ipitio/backage/pkgs/container/backage) [![packages](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fgithub.com%2Fipitio%2Fbackage%2Fraw%2Findex%2F.json&query=%24.packages&logo=github&logoColor=959da5&label=packages&labelColor=333a41&color=2ebc4f)](https://github.com/ipitio/backage/tree/index) [![date](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fgithub.com%2Fipitio%2Fbackage%2Fraw%2Findex%2F.json&query=%24.date&logo=github&logoColor=959da5&label=refreshed&labelColor=333a41&color=2ebc4f)](https://github.com/ipitio/backage/releases/latest)
+[![build](https://github.com/ipitio/backage/actions/workflows/publish.yml/badge.svg)](https://github.com/ipitio/backage/pkgs/container/backage) [![packages](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fgithub.com%2Fipitio%2Fbackage%2Fraw%2Findex%2F.json&query=%24.packages&logo=github&logoColor=959da5&label=packages&labelColor=333a41&color=deepskyblue)](https://github.com/ipitio/backage/tree/index) [![refreshes](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fipitio.github.io%2Fbackage%2Fipitio%2Fbackage%2Fbackage.json&query=%24.downloads&logo=github&logoColor=959da5&label=refreshes&labelColor=333a41&color=peru)](https://github.com/ipitio/backage/releases/latest) [![latest](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fgithub.com%2Fipitio%2Fbackage%2Fraw%2Findex%2F.json&query=%24.date&logo=github&logoColor=959da5&label=latest&labelColor=333a41&color=mediumorchid)](https://github.com/ipitio/backage/releases/latest)
 
 </div>
 
-The GitHub Packages API doesn't expose much of the publicly-available metadata that other registries provide. This completely automated closed-loop system [is the solution](https://github.com/badges/shields/issues/5594#issuecomment-2157626147). **Just star this project to have GitHub supplement its API with an additional endpoint for your public packages!**
+The GitHub Packages API doesn't expose much of the publicly-available metadata that other registries provide, like downloads. This completely automated closed-loop system [is the solution](https://github.com/badges/shields/issues/5594#issuecomment-2157626147). **Just star this project to have GitHub supplement its API with an additional endpoint for your public packages!**
 
 A service ran by GitHub will add them to its circular priority queue within the next few hours and update the [dataset](https://github.com/ipitio/backage/releases/latest). If you'd then like the service to forget and ignore some or all of your packages, add `owner[/repo[/package]]` to `optout.txt` [here](https://github.com/ipitio/backage/edit/master/optout.txt) and make a pull request.
 
@@ -28,7 +28,7 @@ To add any other users or organizations not yet [in the index](https://github.co
 https://ipitio.github.io/backage/OWNER/REPO/PACKAGE.FORMAT
 ```
 
-Use something like [shields.io/json](https://shields.io/badges/dynamic-json-badge) or [shields.io/xml](https://shields.io/badges/dynamic-xml-badge) with this endpoint to access the latest data and make badges like the ones above. Replace `OWNER/REPO/PACKAGE.FORMAT` with their respective values.
+Replace `OWNER/REPO/PACKAGE.FORMAT` with their respective values, then use something like [shields.io/json](https://shields.io/badges/dynamic-json-badge) or [shields.io/xml](https://shields.io/badges/dynamic-xml-badge) to access the latest data and make badges like the `refreshes` one above.
 
 > [!NOTE]
 > The format can be either `json` or `xml`. You'll need the XML endpoint to evaluate expressions, like filters, with Shields -- see [this issue](https://github.com/ipitio/backage/issues/23).
@@ -129,21 +129,21 @@ $.version[?(@.latest)].tags[?(@!="latest")]
 You can query a package for its properties, like size or version:
 
 ```py
-/bkg/PROPERTY
+/xml/PROPERTY
 ```
 
 ```py
-/bkg/size
+/xml/size
 ```
 
 Versions can be filtered in and tags out:
 
 ```py
-/bkg/version[FILTER]/PROPERTY
+/xml/version[FILTER]/PROPERTY
 ```
 
 ```py
-/bkg/version[./latest[.="true"]]/tags[.!="latest"]
+/xml/version[./latest[.="true"]]/tags[.!="latest"]
 ```
 
 </details>

diff --git a/src/lib/util.sh b/src/lib/util.sh
@@ -373,7 +373,7 @@ explore() {
 }
 
 ytox() {
-    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><bkg>$(yq -ox -I0 "$1" | sed 's/"/\\"/g')</bkg>" >"${1%.*}.xml"
+    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><xml>$(yq -ox -I0 "$1" | sed 's/"/\\"/g')</xml>" >"${1%.*}.xml"
 }
 
 ytoy() {

diff --git a/src/test/update.sh b/src/test/update.sh
@@ -69,6 +69,9 @@ if git worktree list | grep -q index; then
     popd || exit 1
 fi
 
-git pull --rebase --autostash 2>/dev/null
-git merge --abort 2>/dev/null
-git pull --rebase --autostash -s ours &>/dev/null
+(git pull --rebase --autostash 2>/dev/null)
+(git merge --abort 2>/dev/null)
+(git pull --rebase --autostash -s ours &>/dev/null)
+git add -- *.txt README.md
+git commit -m "$(date -u +%Y-%m-%d)"
+git push