Update build-info on 2025-12-28T12:14:48Z

Reviewed-on: #1

.gitea/workflows/base-build.yml

@@ -35,6 +35,7 @@ jobs:
       matrix:
         runner:
           - vm-docker-build2
+          - vm-docker-build2
     steps:
       - name: Prune unused Docker images
         run: |
@@ -105,22 +106,24 @@ jobs:
           mkdir -p "upload-repo/$VERSION"
           cp "./output/$VERSION/debian-$VERSION.tar.bz2" "upload-repo/$VERSION/"
 
-      - name: Update sha256sums
+      - name: Update sha256sums (per-version)
         run: |
           cd upload-repo
           VERSION=${{ matrix.version }}
           TAR="../output/$VERSION/debian-$VERSION.tar.bz2"
+          SHA_FILE="$VERSION/sha256sums.txt"
 
-          # Remove old entry
+          mkdir -p "$VERSION"
-          sed -i "/debian-$VERSION.tar.bz2/d" sha256sums.txt 2>/dev/null || true
 
           if [[ ! -f "$TAR" ]]; then
             echo "[ERROR] Tarball not found at $TAR"
+            ls -lh "../output/$VERSION/"
             exit 1
           fi
 
-          # Add new sha256
+          # Calculate SHA256 and store in per-version file
-          sha256sum "$TAR" >> sha256sums.txt
+          sha256sum "$TAR" > "$SHA_FILE"
+          echo "[INFO] SHA256 for $VERSION stored in $SHA_FILE"
 
       - name: Commit and push if changed (matrix-safe)
         id: commit_archives
@@ -129,133 +132,42 @@ jobs:
           git config user.name "${{ env.GIT_USERNAME }}"
           git config user.email "${{ env.GIT_EMAIL }}"
 
-          # Create temporary branch for this version
+          VERSION=${{ matrix.version }}
-          TEMP_BRANCH="tmp-update-${{ matrix.version }}-$(date -u +%s)"
+          TEMP_BRANCH="tmp-update-$VERSION-$(date -u +%s)"
+
+          # Create temporary branch
           git checkout -b "$TEMP_BRANCH"
 
-          # Stage changes
+          # Stage only this version's files
-          git add **/*.tar.bz2 sha256sums.txt
+          git add "$VERSION/debian-$VERSION.tar.bz2" "$VERSION/sha256sums.txt"
 
+          # Check if anything changed
           if git diff --cached --quiet; then
-            echo "[INFO] No changes to commit for ${{ matrix.version }}"
+            echo "[INFO] No changes to commit for $VERSION"
             echo "archives_changed=false" >> $GITEA_OUTPUT
             exit 0
           fi
 
-          git commit -m "Update base image and checksum for ${{ matrix.version }} on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
+          git commit -m "Update base image and checksum for $VERSION on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
 
-          # Push temporary branch
+          # Push temp branch to remote
           git push origin "$TEMP_BRANCH"
 
-          # Merge temp branch into main safely
+          # Switch back to main and rebase onto remote main
           git checkout main
           git fetch origin main
+          git rebase origin/main
+
+          # Merge temp branch
           git merge --no-ff --no-edit "$TEMP_BRANCH"
 
-          # Push main
+          # Push main safely
           git push origin main
 
-          # Delete temporary branch on remote
+          # Delete temporary branch
           git push origin --delete "$TEMP_BRANCH" || true
           echo "archives_changed=true" >> $GITEA_OUTPUT
 
-  # build-and-push-docker-images:
-  #   needs: 
-      # - docker-prune
-      # - build-and-push-rootfs-archives
-  #   if: always()
-  #   # if: needs.build-and-push-rootfs-archives.outputs.archives_changed == 'true'
-  #   runs-on: vm-docker-build2
-  #   steps:
-  #     - name: Checkout source
-  #       uses: actions/checkout@v3
-
-  #     - name: Wait for archives to appear in upload repo
-  #       run: |
-  #         echo "[INFO] Waiting for archives to appear in upload-repo..."
-
-  #         mkdir -p temp-check
-  #         cd temp-check
-
-  #         # Retry loop for cloning the upload-repo
-  #         for i in {1..10}; do
-  #           echo "[INFO] Attempt $i: Cloning upload-repo..."
-  #           if git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${{ secrets.GIT_TOKEN }}@gitea.fithwum.tech/fithwum/debian-base.git"; then
-  #             break
-  #           fi
-  #           echo "[WARN] Clone failed. Retrying in 10 seconds..."
-  #           sleep 10
-  #         done
-
-  #         if [ ! -d "debian-base" ]; then
-  #           echo "[ERROR] Failed to clone upload-repo after retries."
-  #           exit 1
-  #         fi
-
-  #         cd debian-base
-
-  #         # Wait for all versions to show up
-  #         missing_versions=()
-  #         for version in $VERSIONS; do
-  #           found=0
-  #           for i in {1..30}; do
-  #             if [[ -f "$version/debian-$version.tar.bz2" ]]; then
-  #               found=1
-  #               break
-  #             else
-  #               echo "[WAIT] $version not ready yet, sleeping 10s..."
-  #               sleep 10
-  #             fi
-  #           done
-
-  #           if [[ $found -eq 0 ]]; then
-  #             missing_versions+=("$version")
-  #           fi
-  #         done
-
-  #         if [[ ${#missing_versions[@]} -gt 0 ]]; then
-  #           echo "[ERROR] Missing archives for: ${missing_versions[*]}"
-  #           exit 1
-  #         fi
-
-  #     - name: Generate Dockerfiles per version (if missing)
-  #       run: |
-  #         for version in $VERSIONS; do
-  #           mkdir -p "$version"
-  #           DOCKERFILE_PATH="$version/Dockerfile"
-
-  #           if [[ -f "$DOCKERFILE_PATH" ]]; then
-  #             echo "[INFO] Skipping $DOCKERFILE_PATH (already exists)"
-  #             continue
-  #           fi
-
-  #           printf '%s\n' \
-  #             "FROM scratch" \
-  #             "LABEL maintainer=\"fithwum\"" \
-  #             "ADD debian-$version.tar.bz2 /" \
-  #             "CMD [\"/bin/bash\"]" > "$DOCKERFILE_PATH"
-
-  #           echo "[INFO] Created $DOCKERFILE_PATH"
-  #         done
-
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v3
-
-  #     - name: Log in to Gitea Registry
-  #       run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-  #     - name: Build and push Docker images
-  #       run: |
-  #         IMAGE_REGISTRY=gitea.fithwum.tech
-  #         IMAGE_ORG=fithwum
-  #         IMAGE_REPO=debian-base
-
-  #         for TAG in $VERSIONS; do
-  #           FULL_IMAGE="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${TAG}"
-  #           echo "[INFO] Building and pushing $FULL_IMAGE"
-  #           docker buildx build --platform linux/amd64 --push -t "$FULL_IMAGE" "./$TAG"
-  #         done
-
   build-and-push-docker-images:
     name: Build & Push Docker Images (${{ matrix.version }})
     needs:
@@ -376,7 +288,7 @@ jobs:
           fi
 
   generate-build-info:
-    needs: build-and-push-docker-images
+    needs: generate-changelogs
     runs-on: vm-docker-build2
     steps:
     - name: Checkout source
@@ -390,15 +302,6 @@ jobs:
         GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
         git clone --depth=1 "https://${{ env.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/debian-base.git" upload-repo
 
-    - name: Copy sha256sums.txt
-      run: |
-        if [[ -f upload-repo/sha256sums.txt ]]; then
-          cp upload-repo/sha256sums.txt buildinfo/
-        else
-          echo "[ERROR] sha256sums.txt missing in upload-repo!"
-          exit 1
-        fi
-
     - name: Generate build-info.json files
       run: |
         human_size() {
@@ -438,13 +341,30 @@ jobs:
 
           # Load SHA256 from file if available
           TARBALL_NAME="debian-$version.tar.bz2"
-          SHA256_LINE=$(grep -F "$TARBALL_NAME" sha256sums.txt || true)
+          TARBALL_PATH="../upload-repo/$version/$TARBALL_NAME"
-          if [[ -z "$SHA256_LINE" ]]; then
+          SHA_FILE="../upload-repo/$version/sha256sums.txt"
-            echo "[WARN] SHA256 for $TARBALL_NAME not found!"
+
           SHA256="unknown"
-          else
+
+          if [[ -f "$TARBALL_PATH" ]]; then
+            echo "[INFO] Found tarball for $version: $TARBALL_NAME"
+
+            if [[ ! -f "$SHA_FILE" ]]; then
+              echo "[ERROR] sha256sums.txt missing for $version but tarball exists"
+              exit 1
+            fi
+
+            SHA256_LINE=$(grep -F "$TARBALL_NAME" "$SHA_FILE" || true)
+
+            if [[ -z "$SHA256_LINE" ]]; then
+              echo "[ERROR] SHA256 entry missing for $TARBALL_NAME in $SHA_FILE"
+              exit 1
+            fi
+
             SHA256=$(echo "$SHA256_LINE" | awk '{print $1}')
             echo "[INFO] SHA256 for $TARBALL_NAME: $SHA256"
+          else
+            echo "[INFO] No tarball for $version — skipping SHA256 enforcement"
           fi
 
           jq -n \

bookworm/CHANGES.md

@@ -1,3 +1,3 @@
-## 2025-12-21T00:04:43Z
+## 2025-12-28T12:13:19Z
 
-- b31cb55 2025-12-20 test (fithwum)
+- 7b66200 2025-12-21 Update build-info on 2025-12-21T16:41:51Z (fithwum)

bookworm/build-info.json

@@ -1,10 +1,10 @@
 {
   "version": "bookworm",
-  "commit": "a5ce9834ad805fe66e1647a1d4eae861bd0b7e35",
+  "commit": "7b66200599d5f512ecf226717deafaf0ed32f20e",
-  "build_time": "2025-12-20T17:20:38Z",
+  "build_time": "2025-12-28T12:14:19Z",
   "image_tag": "gitea.fithwum.tech/fithwum/debian-base:bookworm",
-  "digest": "gitea.fithwum.tech/fithwum/debian-base@sha256:5c954228972b60057a94326bc50dda998fc5be414d639b1b06d421bdcffe0ea8",
+  "digest": "gitea.fithwum.tech/fithwum/debian-base@sha256:f87d2ae3e7ed4596dfa40cee913ef44ccdb2010f87f260dda007b4bdc88f0b53",
-  "image_size": "304MB",
+  "image_size": "325MB",
-  "image_size_bytes": 319684748,
+  "image_size_bytes": 341436537,
-  "rootfs_sha256": "18ecdd166ff1b257a010d1e261db59f3c4cf25606d9e17dadbef14840752b1e9"
+  "rootfs_sha256": "a37b5b6de6a418ecfc8dabd7a65efa50449f506405757d7f4d4e663e6145ee5b"
 }

bookworm/sha256sums.txt

@@ -0,0 +1 @@
+a37b5b6de6a418ecfc8dabd7a65efa50449f506405757d7f4d4e663e6145ee5b  ../output/bookworm/debian-bookworm.tar.bz2

bullseye/CHANGES.md

@@ -1,3 +1,3 @@
-## 2025-12-21T00:04:43Z
+## 2025-12-28T12:13:19Z
 
-- b31cb55 2025-12-20 test (fithwum)
+- 7b66200 2025-12-21 Update build-info on 2025-12-21T16:41:51Z (fithwum)

bullseye/build-info.json

@@ -1,10 +1,10 @@
 {
   "version": "bullseye",
-  "commit": "a5ce9834ad805fe66e1647a1d4eae861bd0b7e35",
+  "commit": "7b66200599d5f512ecf226717deafaf0ed32f20e",
-  "build_time": "2025-12-20T17:20:23Z",
+  "build_time": "2025-12-28T12:14:10Z",
   "image_tag": "gitea.fithwum.tech/fithwum/debian-base:bullseye",
-  "digest": "gitea.fithwum.tech/fithwum/debian-base@sha256:a5a37b822e24188309d73a4c39e0dc493fbd7bd55a9cdb0d6aaefd823d526eda",
+  "digest": "gitea.fithwum.tech/fithwum/debian-base@sha256:e47f8e49b2489232be51da5937a0ad2fe537dba1b59ede8669268b59f95b4673",
-  "image_size": "208MB",
+  "image_size": "218MB",
-  "image_size_bytes": 218759601,
+  "image_size_bytes": 228748624,
-  "rootfs_sha256": "cb6f3686ad38ba72a484e55d017be1e19cac4ead23123391de2bd0bc64b06b03"
+  "rootfs_sha256": "b3d699eb42a9e6da241df58af68aa96f099c2c7ac339b77b2a78c24b5fd006c3"
 }

bullseye/sha256sums.txt

@@ -0,0 +1 @@
+b3d699eb42a9e6da241df58af68aa96f099c2c7ac339b77b2a78c24b5fd006c3  ../output/bullseye/debian-bullseye.tar.bz2

sha256sums.txt

@@ -1,3 +0,0 @@
-452ef61c9b24e0df006a4b3faea7d036cfa209fe714cda603b2a03b6c16b0893  ../output/bullseye/debian-bullseye.tar.bz2
-6635d22d8b520924e86e09599224250584b8030d046cf858e7bccba755257d6f  ../output/bookworm/debian-bookworm.tar.bz2
-3db4a01e7703d62dba9294bf625dcf1e6ea09080c62356727e0bdd04a897a84c  ../output/trixie/debian-trixie.tar.bz2

trixie/CHANGES.md

@@ -1,3 +1,3 @@
-## 2025-12-21T00:04:43Z
+## 2025-12-28T12:13:19Z
 
-- b31cb55 2025-12-20 test (fithwum)
+- 7b66200 2025-12-21 Update build-info on 2025-12-21T16:41:51Z (fithwum)

trixie/build-info.json

@@ -1,10 +1,10 @@
 {
   "version": "trixie",
-  "commit": "a5ce9834ad805fe66e1647a1d4eae861bd0b7e35",
+  "commit": "7b66200599d5f512ecf226717deafaf0ed32f20e",
-  "build_time": "2025-12-20T17:20:45Z",
+  "build_time": "2025-12-28T12:14:26Z",
   "image_tag": "gitea.fithwum.tech/fithwum/debian-base:trixie",
-  "digest": "gitea.fithwum.tech/fithwum/debian-base@sha256:77e4922b5c37a3876c240072831d38f4a7cf72d6226cd96da0f0bb2b0af211e3",
+  "digest": "gitea.fithwum.tech/fithwum/debian-base@sha256:9d7dd8e765f89935787b7906a0e821ecc3efcbc279337f4a0d6361906992ed30",
-  "image_size": "117MB",
+  "image_size": "209MB",
-  "image_size_bytes": 123027966,
+  "image_size_bytes": 219170606,
-  "rootfs_sha256": "2e0909f40cc33ba12482ce274010990270df7af325dfdb8888723b978c333531"
+  "rootfs_sha256": "afdc3a71cf80b7417cb6a69ea765f94b5f5abc61875662915b73a38af7c0e76f"
 }

trixie/sha256sums.txt

@@ -0,0 +1 @@
+afdc3a71cf80b7417cb6a69ea765f94b5f5abc61875662915b73a38af7c0e76f  ../output/trixie/debian-trixie.tar.bz2