From b1145e3a1c5e8faf3d1a64a403de940386b73102 Mon Sep 17 00:00:00 2001 From: ldelossa Date: Fri, 19 Mar 2021 13:15:57 -0400 Subject: [PATCH] cicd: sort changelog by semver same as https://github.com/quay/claircore/pull/342 Signed-off-by: ldelossa --- .chglog/config.yml | 1 + .github/workflows/cut-release.yml | 6 +++--- .github/workflows/prepare-release.yml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.chglog/config.yml b/.chglog/config.yml index 51711f7d20..c55faf7128 100644 --- a/.chglog/config.yml +++ b/.chglog/config.yml @@ -4,6 +4,7 @@ info: title: CHANGELOG repository_url: https://github.com/quay/clair options: + tag_sort_by: semver commits: sort_by: Scope commit_groups: diff --git a/.github/workflows/cut-release.yml b/.github/workflows/cut-release.yml index 6385a3df66..407a623e96 100644 --- a/.github/workflows/cut-release.yml +++ b/.github/workflows/cut-release.yml @@ -35,10 +35,10 @@ jobs: touch changelog exit 0 fi - curl -o git-chglog -L https://github.com/git-chglog/git-chglog/releases/download/0.9.1/git-chglog_linux_amd64 - chmod u+x git-chglog + curl -o /tmp/git-chglog -L https://github.com/ldelossa/git-chglog/releases/download/v0.11.2-sortbysemver/linux.amd64.git-chglog + chmod u+x /tmp/git-chglog echo "creating change log for tag: $TAG" - ./git-chglog "${TAG}" > changelog + /tmp/git-chglog "${TAG}" > changelog - name: Upload Release Archive uses: actions/upload-artifact@v2 with: diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 2d2b3204a1..85791ee93b 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -25,7 +25,7 @@ jobs: - name: Changelog shell: bash run: | - curl -o /tmp/git-chglog -L https://github.com/git-chglog/git-chglog/releases/download/0.9.1/git-chglog_linux_amd64 + curl -o /tmp/git-chglog -L https://github.com/ldelossa/git-chglog/releases/download/v0.11.2-sortbysemver/linux.amd64.git-chglog chmod u+x /tmp/git-chglog echo "creating change log for tag: ${{ github.event.inputs.tag }}" /tmp/git-chglog --tag-filter-pattern "v4" --next-tag "${{ github.event.inputs.tag }}" -o CHANGELOG.md v4.0.0-alpha.2..