diff --git a/.cache/alpine-base.digest b/.cache/alpine-base.digest deleted file mode 100644 index 8b13789..0000000 --- a/.cache/alpine-base.digest +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.cache/basic-base.digest b/.cache/basic-base.digest deleted file mode 100644 index 8b13789..0000000 --- a/.cache/basic-base.digest +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.cache/debian-base.digest b/.cache/debian-base.digest deleted file mode 100644 index 8b13789..0000000 --- a/.cache/debian-base.digest +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index e9de57f..4987c96 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -364,6 +364,11 @@ jobs: with: fetch-depth: 0 + - name: Sync with latest main + run: | + git fetch origin main + git reset --hard origin/main + - name: Generate changelogs only for updated variants run: | versions=() @@ -395,13 +400,12 @@ jobs: last_commit="" fi - echo -e "\n## $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$changelog" + echo -e "\n## $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$changelog" + git log -n 10 --pretty=format:"- %s (%an)" \ + --no-merges \ + --invert-grep \ + --grep="Update changelogs on" >> "$changelog" - if [ -n "$last_commit" ]; then - git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" --no-merges --invert-grep --grep="Update changelogs on" | head -n 10 >> "$changelog" - else - git log -n 10 --pretty=format:"- %s (%an)" --no-merges --invert-grep --grep="Update changelogs on" >> "$changelog" - fi done - name: Commit and push changelogs