Merge pull request #573 from merico-dev/chore-fix-release-scripts

chore: update release version related bug

Author: Tiexin Guo

.github/workflows/automated-release.yml

@@ -45,7 +45,7 @@ jobs:
       - name: upload core
         run: bash -e ./hack/release/upload_assets.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.TAG }} ${{ env.GOOS }} ${{ env.GOARCH }}
       - name: upload plugin
-        run: aws s3 cp .devstream/  s3://download.devstream.io/${{ env.TAG }}/ --recursive --acl public-read
+        run: aws s3 cp .devstream/ s3://download.devstream.io/${{ env.TAG }}/ --recursive --acl public-read
 
   # release for darwin-amd64
   build-and-release-on-darwin-amd64:

Makefile

@@ -24,7 +24,9 @@ ROOT_DIR := $(abspath $(shell cd $(SELF_DIR) && pwd -P))
 endif
 
 ifeq ($(origin VERSION), undefined)
-VERSION := $(shell git describe --tags --always --match='v*')
+# the VERSION is a number, like 0.6.0
+# it doesn't contain the prefix v, not v0.6.0, but 0.6.0
+VERSION := $(shell git describe --tags --always --match='v*' | cut -c 2-)
 endif
 
 ifeq ($(origin PLUGINS_DIR),undefined)

hack/release/auto-release-darwin-arm64.sh

@@ -18,7 +18,7 @@ while getopts "t:" opt; do
 done
 
 if [ "${tag}" == "invalid" ]; then
-  echo "Maybe you forgot to use -t flag. E.g. sh auto-release-darwin-arm64.sh -t v0.6.0"
+  echo "Maybe you forgot to use -t flag. E.g. sh auto-release-darwin-arm64.sh -t 0.6.0"
   exit 1
 fi
 echo "tag: ${tag}"