Merge pull request #105 from cyclinder/ci

fix auto release by workflow_dispatch
spidernet-io · Nov 26, 2022 · 854d783 · 854d783
2 parents ad2cc1c + 7e33c9a
commit 854d783
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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