From 19d5a17a99a21d9c50e2abc0b9c251318515c6c0 Mon Sep 17 00:00:00 2001 From: Martin Schurz Date: Tue, 16 Mar 2021 10:56:17 +0100 Subject: [PATCH 1/3] remove second call to changelog generator Signed-off-by: Martin Schurz --- .github/workflows/release.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e9a57b4aa..241327e7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,16 +56,10 @@ jobs: fetch-depth: 0 - name: Generate changelog for the release - uses: charmixer/auto-changelog-action@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - since_tag: ${{ steps.previoustag.outputs.tag }} - future_release: ${{ steps.version.outputs.next-version }} - output: CHANGELOGRELEASE.md - # this excludes all versions prior to the collection-release - # since they break the changelog generation with the error: - # "No common ancestor between ... and $version" - exclude_tags_regex: '[0-6]\.\d\.\d' + run: | + sed '/## \[${{ steps.previoustag.outputs.tag }}\]/Q' \ + /mnt/c/Develop/ansible-collection-hardening/CHANGELOG.md \ + > CHANGELOGRELEASE.md - name: Read CHANGELOG.md id: package From d1b8e7d7a3900721e97f3537c6d9ab4fe5cfb46e Mon Sep 17 00:00:00 2001 From: Martin Schurz Date: Tue, 16 Mar 2021 11:00:40 +0100 Subject: [PATCH 2/3] update paths Signed-off-by: Martin Schurz --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 241327e7f..6a16cf1cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,9 +57,7 @@ jobs: - name: Generate changelog for the release run: | - sed '/## \[${{ steps.previoustag.outputs.tag }}\]/Q' \ - /mnt/c/Develop/ansible-collection-hardening/CHANGELOG.md \ - > CHANGELOGRELEASE.md + sed '/## \[${{ steps.previoustag.outputs.tag }}\]/Q' CHANGELOG.md > CHANGELOGRELEASE.md - name: Read CHANGELOG.md id: package From cd4925d41104c284edd117363198e3ef7ba5328c Mon Sep 17 00:00:00 2001 From: Martin Schurz Date: Tue, 16 Mar 2021 11:07:21 +0100 Subject: [PATCH 3/3] checkout master between Signed-off-by: Martin Schurz --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a16cf1cc..90b3b9063 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: # changelog gets updated but action works on old commit id - uses: actions/checkout@v2.3.4 with: - fetch-depth: 0 + ref: master - name: Generate changelog for the release run: |