From c78ae1ff4e6e0cb4bfbb29bec5ded7d163a66f20 Mon Sep 17 00:00:00 2001 From: fithwum Date: Sat, 20 Dec 2025 16:42:43 -0800 Subject: [PATCH] test --- .gitea/workflows/base-build.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index afa3559..7858a7f 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -108,22 +108,23 @@ 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 - sed -i "/debian-$VERSION.tar.bz2/d" sha256sums.txt 2>/dev/null || true + mkdir -p "$VERSION" if [[ ! -f "$TAR" ]]; then echo "[ERROR] Tarball not found at $TAR" exit 1 fi - # Add new sha256 - sha256sum "$TAR" >> sha256sums.txt + # Calculate SHA256 and store in per-version file + sha256sum "$TAR" > "$SHA_FILE" + echo "[INFO] SHA256 for $VERSION stored in $SHA_FILE" - name: Commit and push if changed (matrix-safe) id: commit_archives @@ -132,20 +133,22 @@ jobs: git config user.name "${{ env.GIT_USERNAME }}" git config user.email "${{ env.GIT_EMAIL }}" + VERSION=${{ matrix.version }} + # Create temporary branch for this version - TEMP_BRANCH="tmp-update-${{ matrix.version }}-$(date -u +%s)" + TEMP_BRANCH="tmp-update-${VERSION}-$(date -u +%s)" git checkout -b "$TEMP_BRANCH" - # Stage changes - git add **/*.tar.bz2 sha256sums.txt + # Stage changes: tarball + version-specific SHA file + git add "$VERSION/debian-$VERSION.tar.bz2" "$VERSION/sha256sums.txt" 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 git push origin "$TEMP_BRANCH" @@ -160,6 +163,7 @@ jobs: # Delete temporary branch on remote git push origin --delete "$TEMP_BRANCH" || true + echo "archives_changed=true" >> $GITEA_OUTPUT # build-and-push-docker-images: