From 8ebeeee75b3414c890b5981d05980f574cd4ccab Mon Sep 17 00:00:00 2001 From: cyclinder Date: Fri, 25 Nov 2022 10:58:32 +0000 Subject: [PATCH 1/2] Auto Update Changelog for v0.1.9 --- docs/changelog-v0.1.9.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/changelog-v0.1.9.md diff --git a/docs/changelog-v0.1.9.md b/docs/changelog-v0.1.9.md new file mode 100644 index 00000000..999559ad --- /dev/null +++ b/docs/changelog-v0.1.9.md @@ -0,0 +1 @@ +**Full Changelog**: https://github.com/cyclinder/cni-plugins/commits/v0.1.9 From 7e33c9aca907a4330cc9de7837e0e5ca2d4fb67b Mon Sep 17 00:00:00 2001 From: cyclinder Date: Sun, 27 Nov 2022 00:19:14 +0800 Subject: [PATCH 2/2] fix auto release by workflow_dispatch Signed-off-by: cyclinder --- .github/workflows/image-build.yaml | 5 ++++- .github/workflows/release.yaml | 1 - docs/changelog-v0.1.9.md | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 docs/changelog-v0.1.9.md diff --git a/.github/workflows/image-build.yaml b/.github/workflows/image-build.yaml index 245646ec..9d7a8619 100644 --- a/.github/workflows/image-build.yaml +++ b/.github/workflows/image-build.yaml @@ -38,7 +38,10 @@ jobs: if ${{ inputs.ref != '' }} ; then echo "call by workflow_call" echo "tag=${{ inputs.ref }}" >> $GITHUB_OUTPUT - grep " v " <<< " ${{ inputs.ref }} " && echo "tag=${{ inputs.ref }}" >> $GITHUB_OUTPUT + dispatch=$(egrep "^v" <<< "${{ inputs.ref }}") + if [ -n "${dispatch}" ] ; then + echo "tag=main" >> $GITHUB_OUTPUT + fi echo ::set-output name=version::${{ inputs.ref }} echo ::set-output name=push::${{ inputs.push }} elif ${{ github.event_name == 'push' }} ; then diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3cc5895a..83ae029d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -117,7 +117,6 @@ jobs: -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/latest |yq '.body' > changelog-${latest_release}.md - cat changelog-${latest_release}.md cp -rp changelog-${latest_release}.md docs/ cp -rp changelog-${latest_release}.md docs/ rm -rf changelog-${latest_release}.md diff --git a/docs/changelog-v0.1.9.md b/docs/changelog-v0.1.9.md deleted file mode 100644 index 999559ad..00000000 --- a/docs/changelog-v0.1.9.md +++ /dev/null @@ -1 +0,0 @@ -**Full Changelog**: https://github.com/cyclinder/cni-plugins/commits/v0.1.9