From 9dac56f9cd2e6993a5f2f5c08fdde58b30ef81b8 Mon Sep 17 00:00:00 2001
From: melody <admin@melthecat.dev>
Date: Sun, 6 Jul 2025 23:01:40 +0200
Subject: [PATCH] Update .forgejo/workflows/package-check.yml

---
 .forgejo/workflows/package-check.yml | 44 +++++++++++++++-------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/.forgejo/workflows/package-check.yml b/.forgejo/workflows/package-check.yml
index 67e5ae4..e1e41c4 100644
--- a/.forgejo/workflows/package-check.yml
+++ b/.forgejo/workflows/package-check.yml
@@ -31,27 +31,27 @@ jobs:
 
       - uses: actions/checkout@v3
 
-- name: Get latest package version
-  id: check
-  run: |
-    main_version=$(curl -s https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz \
-    | tar -xzO \
-    | awk '$0=="P:rsync" { getline; if ($0 ~ /^V:/) print substr($0,3) }' \
-    | sort -V | tail -n1)
+      - name: Get latest package version
+        id: check
+        run: |
+          main_version=$(curl -s https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz \
+          | tar -xzO \
+          | awk '$0=="P:rsync" { getline; if ($0 ~ /^V:/) print substr($0,3) }' \
+          | sort -V | tail -n 1)
 
-    community_version=$(curl -s https://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz \
-    | tar -xzO \
-    | awk '$0=="P:rsync" { getline; if ($0 ~ /^V:/) print substr($0,3) }' \
-    | sort -V | tail -n1)
+          community_version=$(curl -s https://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz \
+          | tar -xzO \
+          | awk '$0=="P:rsync" { getline; if ($0 ~ /^V:/) print substr($0,3) }' \
+          | sort -V | tail -n 1)
 
-    testing_version=$(curl -s https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/APKINDEX.tar.gz \
-    | tar -xzO \
-    | awk '$0=="P:rsync" { getline; if ($0 ~ /^V:/) print substr($0,3) }' \
-    | sort -V | tail -n1)
+          testing_version=$(curl -s https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/APKINDEX.tar.gz \
+          | tar -xzO \
+          | awk '$0=="P:rsync" { getline; if ($0 ~ /^V:/) print substr($0,3) }' \
+          | sort -V | tail -n 1)
 
-    newest_version=$(echo -e "$main_version\n$community_version\n$testing_version" | sort -V | tail -n1)
+          newest_version=$(echo -e "$main_version\n$community_version\n$testing_version" | sort -V | tail -n 1)
 
-    echo "NEWEST_VERSION=$newest_version" >> $GITHUB_ENV
+          echo "NEWEST_VERSION=$newest_version" >> $GITHUB_ENV
 
       - name: Determine if update is needed
         run: |
@@ -62,7 +62,7 @@ jobs:
           last_version=$(cat $last_version_file 2>/dev/null || echo "none")
           last_rebuild=$(cat $last_rebuild_file 2>/dev/null || echo 0)
           last_dockerfile_hash=$(cat $last_dockerfile_hash_file 2>/dev/null || echo "none")
-          dockerfile_hash=$(sha256sum Dockerfile 2>/dev/null || echo "nuh")
+          dockerfile_hash=$(sha256sum Dockerfile 2>/dev/null | awk '{print $1}' || echo "nuh")
           current_day=$(( $(date +%s) / 86400 ))
 
           update="false"
@@ -86,18 +86,20 @@ jobs:
       - name: Build and push Docker image
         if: env.UPDATE == 'true'
         run: |
-          docker build -t $DOCKER_REGISTRY/$REGISTRY_USER/docker-$PACKAGE:latest -t $DOCKER_REGISTRY/$REGISTRY_USER/docker-$PACKAGE:$LATEST_VERSION .
+          docker build -t $DOCKER_REGISTRY/$REGISTRY_USER/docker-$PACKAGE:latest -t $DOCKER_REGISTRY/$REGISTRY_USER/docker-$PACKAGE:$NEWEST_VERSION .
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login $DOCKER_REGISTRY -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
           docker push $DOCKER_REGISTRY/$REGISTRY_USER/docker-$PACKAGE:latest
-          docker push $DOCKER_REGISTRY/$REGISTRY_USER/docker-$PACKAGE:$LATEST_VERSION
+          docker push $DOCKER_REGISTRY/$REGISTRY_USER/docker-$PACKAGE:$NEWEST_VERSION
           echo "$NEWEST_VERSION" > .last_version
           echo $(( $(date +%s) / 86400 )) > .last_rebuild
+          dockerfile_hash=$(sha256sum Dockerfile | awk '{print $1}')
+          echo "$dockerfile_hash" > .dockerfile_hash
 
       - name: Commit updated metadata
         if: env.UPDATE == 'true'
         run: |
           git config user.name "$COMMIT_AUTHOR_NAME"
           git config user.email "$COMMIT_AUTHOR_EMAIL"
-          git add .last_version .last_rebuild
+          git add .last_version .last_rebuild .dockerfile_hash
           git commit -m "$COMMIT_MESSAGE"
           git push