From af317dfbd33eff3097354e5566cee508798160a8 Mon Sep 17 00:00:00 2001 From: fithwum Date: Sat, 5 Jul 2025 16:40:28 -0700 Subject: [PATCH] fix --- .gitea/workflows/base-build.yml | 34 +++++++-------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index 91160eb..e267c99 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -124,7 +124,7 @@ jobs: - name: Clone upload repo run: git clone "${{ env.REPO_URL }}" upload-repo - - name: Generate CHANGES.md and build-info.json + - name: Generate CHANGES.md files run: | cd upload-repo @@ -133,31 +133,11 @@ jobs: mkdir -p "$version" changelog="$version/CHANGES.md" - infofile="$version/build-info.json" touch "$changelog" - last_commit="" - if [ -f "$infofile" ]; then - last_commit=$(jq -r '.commit' "$infofile") - fi - 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" - else - git log -n 5 --pretty=format:"- %s (%an)" >> "$changelog" - fi - - # Build metadata file - cat < "$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 + git log -n 5 --pretty=format:"- %s (%an)" >> "$changelog" + done - name: Commit and push changelogs if changed run: | @@ -166,9 +146,9 @@ EOF 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 */CHANGES.md + git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ')" git push else - echo "[INFO] No changelog or metadata changes to commit." - fi \ No newline at end of file + echo "[INFO] No changelog changes to commit." + fi