Update build-info on 2025-07-06T13:01:37Z

.gitea/workflows/base-build.yml

@@ -1,9 +1,12 @@
-name: Build, Upload RootFS, and Push Docker Images
+name: Build, Upload RootFS, and Push Docker Images, update changelog, update build info.
 
 on:
   push:
     branches:
       - main
+    paths-ignore:
+      - '**/CHANGES.md'
+      - '**/build-info.json'
   schedule:
     - cron: '0 12 * * 0'  # Sundays at noon UTC
 
@@ -87,8 +90,8 @@ jobs:
           fi
 
   build-and-push-docker-images:
-    needs: push-archives-to-repo
-    if: needs.push-archives-to-repo.outputs.archives_changed == 'true'
+    # needs: push-archives-to-repo
+    # if: needs.push-archives-to-repo.outputs.archives_changed == 'true'
     runs-on: docker-build
 
     steps:
@@ -114,7 +117,7 @@ jobs:
           done
 
   generate-changelogs:
-    # needs: build-and-push-docker-images
+    needs: build-and-push-docker-images
     runs-on: docker-build
 
     steps:
@@ -122,20 +125,19 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Clone upload repo
-        run: git clone "${{ env.REPO_URL }}" upload-repo
+        run: git clone https://${{ secrets.GIT_USERNAME }}:${{ secrets.GIT_TOKEN }}@gitea.fithwum.tech/fithwum/debian-base.git upload-repo
 
-      - name: Generate CHANGES.md and build-info.json
+      - name: Generate per-version changelogs
         run: |
           cd upload-repo
-
           for version in buster bullseye bookworm docker-build; do
-            echo "[INFO] Processing $version"
+            echo "[INFO] Updating changelog for $version"
 
-            mkdir -p "$version"
             changelog="$version/CHANGES.md"
-            infofile="$version/build-info.json"
+            mkdir -p "$(dirname "$changelog")"
             touch "$changelog"
 
+            infofile="$version/build-info.json"
             last_commit=""
             if [ -f "$infofile" ]; then
               last_commit=$(jq -r '.commit' "$infofile")
@@ -143,32 +145,109 @@ jobs:
 
             echo -e "\n## $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$changelog"
             if [ -n "$last_commit" ]; then
-              git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" >> "$changelog"
+              git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" | head -n 10 >> "$changelog"
             else
-              git log -n 5 --pretty=format:"- %s (%an)" >> "$changelog"
+              git log -n 10 --pretty=format:"- %s (%an)" >> "$changelog"
             fi
-
-            # Build metadata file
-            cat <<EOF > "$infofile"
-            {
-              "version": "$version",
-              "commit": "$(git rev-parse HEAD)",
-              "build_time": "$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-              "image_tag": "gitea.fithwum.tech/fithwum/debian-base:$version"
-            }
-            EOF
-            done
+          done
 
       - name: Commit and push changelogs if changed
+        run: |
+          cd upload-repo
+          git config user.name "${{ secrets.GIT_USERNAME }}"
+          git config user.email "${{ secrets.GIT_EMAIL }}"
+
+          if git status --porcelain | grep .; then
+            git add */CHANGES.md
+            git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ')" --no-verify
+            git push
+          else
+            echo "[INFO] No changelog changes to commit."
+          fi
+
+  generate-build-info:
+    needs: generate-changelogs
+    runs-on: docker-build
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v3
+
+      - name: Clone upload repo
+        run: |
+          git clone "https://${{ secrets.GIT_USERNAME }}:${{ secrets.GIT_TOKEN }}@gitea.fithwum.tech/fithwum/debian-base.git" upload-repo
+
+      - name: Generate build-info.json per version
+        run: |
+          human_size() {
+            local b=$1
+            local d=''
+            local s=0
+            local S=(B KB MB GB TB)
+            while ((b >= 1024 && s < ${#S[@]}-1)); do
+              d=$((b % 1024))
+              b=$((b / 1024))
+              s=$((s + 1))
+            done
+            printf "%s%s\n" "$b" "${S[$s]}"
+          }
+
+          cd upload-repo
+          for version in buster bullseye bookworm docker-build; do
+            echo "[INFO] Generating build-info.json for $version"
+            mkdir -p "$version"
+            infofile="$version/build-info.json"
+
+            image="gitea.fithwum.tech/fithwum/debian-base:$version"
+
+            digest=$(docker inspect --format='{{if .RepoDigests}}{{index .RepoDigests 0}}{{else}}unknown{{end}}' "$image" 2>/dev/null || echo "unknown")
+            size_bytes=$(docker image inspect "$image" --format='{{.Size}}' 2>/dev/null || echo "0")
+
+            size_bytes=${size_bytes//[^0-9]/}
+            if [[ -z "$size_bytes" ]]; then size_bytes=0; fi
+
+            size_human=$(human_size "$size_bytes")
+
+            jq -n \
+              --arg version "$version" \
+              --arg commit "$(git rev-parse HEAD)" \
+              --arg build_time "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
+              --arg image_tag "$image" \
+              --arg digest "$digest" \
+              --arg image_size "$size_human" \
+              --argjson image_size_bytes "$size_bytes" \
+              '{
+                version: $version,
+                commit: $commit,
+                build_time: $build_time,
+                image_tag: $image_tag,
+                digest: $digest,
+                image_size: $image_size,
+                image_size_bytes: $image_size_bytes
+              }' > "$infofile"
+          done
+
+      - name: Commit and push build-info if changed
         run: |
           cd upload-repo
           git config --global user.name "${{ env.GIT_USERNAME }}"
           git config --global user.email "${{ env.GIT_EMAIL }}"
 
           if git status --porcelain | grep .; then
-            git add */CHANGES.md */build-info.json
-            git commit -m "Update changelogs and metadata on $(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+            git add */build-info.json
+            git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ')"
             git push
+
+            # Tag the commit for each version
+            for version in buster bullseye bookworm docker-build; do
+              TAG="build-$version"
+              # Delete local tag if exists
+              git tag -d "$TAG" 2>/dev/null || true
+              # Create tag on current HEAD
+              git tag "$TAG"
+              # Push tag to remote (force in case tag exists)
+              git push origin "$TAG" --force
+            done
           else
-            echo "[INFO] No changelog or metadata changes to commit."
+            echo "[INFO] No build-info changes to commit."
           fi

bookworm/CHANGES.md

@@ -0,0 +1,47 @@
+
+## 2025-07-06T00:32:06Z
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+- test (fithwum)
+- fix repo url (fithwum)
+## 2025-07-06T00:40:35Z
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+- test (fithwum)
+## 2025-07-06T00:48:48Z
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+## 2025-07-06T00:57:06Z
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+## 2025-07-06T01:05:17Z
+- Update changelogs on 2025-07-06T00:57:07Z (fithwum)
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+## 2025-07-06T01:22:33Z
+- update (fithwum)
+- Update .gitea/workflows/base-build.yml (fithwum)
+- Update changelogs on 2025-07-06T01:05:18Z (fithwum)
+- Update changelogs on 2025-07-06T00:57:07Z (fithwum)
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+## 2025-07-06T02:05:32Z
+- fix spaceing in build logs (fithwum)
+- test (fithwum)
+- test (fithwum)
+- reenabled needs section in workflow (fithwum)
+- Update changelogs on 2025-07-06T01:22:34Z (fithwum)
+## 2025-07-06T13:00:31Z
+- autl build chain test (fithwum)
+- enable needs for build info after testing (fithwum)
+- Update build-info on 2025-07-06T12:34:12Z (fithwum)

bookworm/build-info.json

@@ -0,0 +1,9 @@
+{
+  "version": "bookworm",
+  "commit": "e06634eee8adfcda50b630196bf150b7babbadbc",
+  "build_time": "2025-07-06T13:01:36Z",
+  "image_tag": "gitea.fithwum.tech/fithwum/debian-base:bookworm",
+  "digest": "unknown",
+  "image_size": "281MB",
+  "image_size_bytes": 295153546
+}

bullseye/CHANGES.md

@@ -0,0 +1,47 @@
+
+## 2025-07-06T00:32:06Z
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+- test (fithwum)
+- fix repo url (fithwum)
+## 2025-07-06T00:40:35Z
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+- test (fithwum)
+## 2025-07-06T00:48:48Z
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+## 2025-07-06T00:57:06Z
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+## 2025-07-06T01:05:17Z
+- Update changelogs on 2025-07-06T00:57:07Z (fithwum)
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+## 2025-07-06T01:22:33Z
+- update (fithwum)
+- Update .gitea/workflows/base-build.yml (fithwum)
+- Update changelogs on 2025-07-06T01:05:18Z (fithwum)
+- Update changelogs on 2025-07-06T00:57:07Z (fithwum)
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+## 2025-07-06T02:05:32Z
+- fix spaceing in build logs (fithwum)
+- test (fithwum)
+- test (fithwum)
+- reenabled needs section in workflow (fithwum)
+- Update changelogs on 2025-07-06T01:22:34Z (fithwum)
+## 2025-07-06T13:00:31Z
+- autl build chain test (fithwum)
+- enable needs for build info after testing (fithwum)
+- Update build-info on 2025-07-06T12:34:12Z (fithwum)

bullseye/build-info.json

@@ -0,0 +1,9 @@
+{
+  "version": "bullseye",
+  "commit": "e06634eee8adfcda50b630196bf150b7babbadbc",
+  "build_time": "2025-07-06T13:01:36Z",
+  "image_tag": "gitea.fithwum.tech/fithwum/debian-base:bullseye",
+  "digest": "unknown",
+  "image_size": "281MB",
+  "image_size_bytes": 295153546
+}

buster/CHANGES.md

@@ -0,0 +1,47 @@
+
+## 2025-07-06T00:32:06Z
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+- test (fithwum)
+- fix repo url (fithwum)
+## 2025-07-06T00:40:35Z
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+- test (fithwum)
+## 2025-07-06T00:48:48Z
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+## 2025-07-06T00:57:06Z
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+## 2025-07-06T01:05:17Z
+- Update changelogs on 2025-07-06T00:57:07Z (fithwum)
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+## 2025-07-06T01:22:33Z
+- update (fithwum)
+- Update .gitea/workflows/base-build.yml (fithwum)
+- Update changelogs on 2025-07-06T01:05:18Z (fithwum)
+- Update changelogs on 2025-07-06T00:57:07Z (fithwum)
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+## 2025-07-06T02:05:32Z
+- fix spaceing in build logs (fithwum)
+- test (fithwum)
+- test (fithwum)
+- reenabled needs section in workflow (fithwum)
+- Update changelogs on 2025-07-06T01:22:34Z (fithwum)
+## 2025-07-06T13:00:31Z
+- autl build chain test (fithwum)
+- enable needs for build info after testing (fithwum)
+- Update build-info on 2025-07-06T12:34:12Z (fithwum)

buster/build-info.json

@@ -0,0 +1,9 @@
+{
+  "version": "buster",
+  "commit": "e06634eee8adfcda50b630196bf150b7babbadbc",
+  "build_time": "2025-07-06T13:01:36Z",
+  "image_tag": "gitea.fithwum.tech/fithwum/debian-base:buster",
+  "digest": "unknown",
+  "image_size": "281MB",
+  "image_size_bytes": 295153546
+}

docker-build/CHANGES.md

@@ -0,0 +1,47 @@
+
+## 2025-07-06T00:32:06Z
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+- test (fithwum)
+- fix repo url (fithwum)
+## 2025-07-06T00:40:35Z
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+- test (fithwum)
+## 2025-07-06T00:48:48Z
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+- test (fithwum)
+## 2025-07-06T00:57:06Z
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+- fix (fithwum)
+## 2025-07-06T01:05:17Z
+- Update changelogs on 2025-07-06T00:57:07Z (fithwum)
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+- Update changelogs on 2025-07-06T00:40:36Z (fithwum)
+- Update changelogs on 2025-07-06T00:32:06Z (fithwum)
+- test fix (fithwum)
+## 2025-07-06T01:22:33Z
+- update (fithwum)
+- Update .gitea/workflows/base-build.yml (fithwum)
+- Update changelogs on 2025-07-06T01:05:18Z (fithwum)
+- Update changelogs on 2025-07-06T00:57:07Z (fithwum)
+- Update changelogs on 2025-07-06T00:48:49Z (fithwum)
+## 2025-07-06T02:05:32Z
+- fix spaceing in build logs (fithwum)
+- test (fithwum)
+- test (fithwum)
+- reenabled needs section in workflow (fithwum)
+- Update changelogs on 2025-07-06T01:22:34Z (fithwum)
+## 2025-07-06T13:00:32Z
+- autl build chain test (fithwum)
+- enable needs for build info after testing (fithwum)
+- Update build-info on 2025-07-06T12:34:12Z (fithwum)

docker-build/build-info.json

@@ -0,0 +1,9 @@
+{
+  "version": "docker-build",
+  "commit": "e06634eee8adfcda50b630196bf150b7babbadbc",
+  "build_time": "2025-07-06T13:01:36Z",
+  "image_tag": "gitea.fithwum.tech/fithwum/debian-base:docker-build",
+  "digest": "unknown",
+  "image_size": "281MB",
+  "image_size_bytes": 295153546
+}