Update .gitea/workflows/base-build.yml

.gitea/workflows/base-build.yml

@@ -10,7 +10,6 @@ on:
       - '**/*.sh'
       - '!**/CHANGES.md'
       - '!**/build-info.json'
-  workflow_dispatch: {}
   schedule:
     - cron: '30 */6 * * *'
 
@@ -21,6 +20,7 @@ env:
   IMAGE_REPO_MINECRAFT: minecraft
   IMAGE_TAG_DEBIAN: bookworm
   DIGEST_FILE: .cache/debian-base.digest
+  VERSIONS: vanilla testing fabric
 
 jobs:
   poll-debian-base-and-detect-changes:
@@ -76,7 +76,7 @@ jobs:
           fi
           CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
           CHANGED_VERSIONS=""
-          for version in vanilla testing fabric; do
+          for version in $VERSIONS; do
             echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
           done
           CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
@@ -97,6 +97,19 @@ jobs:
       - name: Log in to Gitea Registry
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login ${{ env.IMAGE_REGISTRY }} -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
+      - name: Clone Minecraft repo (with retries)
+        run: |
+          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
+          for i in {1..5}; do
+            git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo && break
+            echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
+            sleep 10
+          done
+          if [ ! -d upload-repo ]; then
+            echo "[ERROR] Failed to clone Minecraft repo after retries."
+            exit 1
+          fi
+
       - name: Build and push image
         run: |
           IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
@@ -110,11 +123,21 @@ jobs:
         version: [vanilla, testing, fabric]
 
     steps:
-      - name: Checkout source
+      - name: Checkout repo
         uses: actions/checkout@v3
 
-      - name: Clone Minecraft repo
+      - name: Clone Minecraft repo (with retries)
-        run: git clone https://${{ secrets.GIT_USERNAME }}:${{ secrets.GIT_TOKEN }}@gitea.fithwum.tech/fithwum/minecraft.git upload-repo
+        run: |
+          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
+          for i in {1..5}; do
+            git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo && break
+            echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
+            sleep 10
+          done
+          if [ ! -d upload-repo ]; then
+            echo "[ERROR] Failed to clone Minecraft repo after retries."
+            exit 1
+          fi
 
       - name: Update changelog
         run: |
@@ -129,7 +152,7 @@ jobs:
             last_commit=$(jq -r '.commit' "$infofile")
           fi
 
-          echo -e "\n## $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$changelog"
+          echo -e "## $(date -u +'%Y-%m-%dT%H:%M:%SZ')\n" >> "$changelog"
           if [ -n "$last_commit" ]; then
             git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" | head -n 10 >> "$changelog"
           else
@@ -141,9 +164,13 @@ jobs:
           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 "${{ matrix.version }}/CHANGES.md"
             git commit -m "Update changelog for ${{ matrix.version }}" || true
             git push
+          else
+            echo "[INFO] No changelog changes to commit."
+          fi
 
   generate-build-info:
     needs: generate-changelogs
@@ -153,17 +180,29 @@ jobs:
         version: [vanilla, testing, fabric]
 
     steps:
-      - name: Checkout source
+      - name: Checkout repo
         uses: actions/checkout@v3
 
-      - name: Clone Minecraft repo
+      - name: Clone Minecraft repo (with retries)
-        run: git clone https://${{ secrets.GIT_USERNAME }}:${{ secrets.GIT_TOKEN }}@gitea.fithwum.tech/fithwum/minecraft.git upload-repo
+        run: |
+          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
+          for i in {1..5}; do
+            git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo && break
+            echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
+            sleep 10
+          done
+          if [ ! -d upload-repo ]; then
+            echo "[ERROR] Failed to clone Minecraft repo after retries."
+            exit 1
+          fi
 
       - name: Generate build-info.json
         run: |
           human_size() {
             local b=$1 d='' s=0 S=(B KB MB GB TB)
-            while ((b >= 1024 && s < ${#S[@]}-1)); do d=$((b % 1024)); b=$((b / 1024)); s=$((s + 1)); done
+            while ((b >= 1024 && s < ${#S[@]}-1)); do
+              d=$((b % 1024)); b=$((b / 1024)); s=$((s + 1))
+            done
             printf "%s%s\n" "$b" "${S[$s]}"
           }
 
@@ -171,8 +210,18 @@ jobs:
           mkdir -p "${{ matrix.version }}"
           infofile="${{ matrix.version }}/build-info.json"
           image="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_MINECRAFT }}:${{ matrix.version }}"
-          digest=$(docker inspect --format='{{index .RepoDigests 0}}' "$image" 2>/dev/null || echo "unknown")
+
+          if ! docker pull "$image"; then
+            echo "[WARN] Failed to pull $image — setting fields to 'unknown/0'"
+            digest="unknown"
+            size_bytes=0
+          else
+            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
+          fi
+
           size_human=$(human_size "$size_bytes")
 
           jq -n \
@@ -198,5 +247,16 @@ jobs:
           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 "${{ matrix.version }}/build-info.json"
-          git
+            git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ')" || true
+            git push
+
+            # Optional: push lightweight tag for this build
+            TAG="build-${{ matrix.version }}"
+            git tag -d "$TAG" 2>/dev/null || true
+            git tag "$TAG"
+            git push origin "$TAG" --force
+          else
+            echo "[INFO] No build-info changes to commit."
+          fi