Update release workflow

youtype · Apr 8, 2020 · 7d6714e · 7d6714e
1 parent 1edfb62
commit 7d6714e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
@@ -22,13 +22,7 @@ jobs:
         id: vars
         run: |
           echo "GitHub ref ${GITHUB_REF}"
-          VERSION_TAG=`echo "${GITHUB_REF}" | cut -f 3 -d "/"`
-          if [[ "$VERSION_TAG" != *"-release" ]]; then
-            echo "Release tag should end with '-release', e.g. '1.2.3-rc1-release'"
-            echo "Stopping now."
-            exit 1
-          fi
-          VERSION=`echo "$VERSION_TAG" | sed "s/-release//"`
+          VERSION=`echo "${GITHUB_REF}" | cut -f 3 -d "/"`
           LAST_PACKAGE_VERSION=`pip show boto3-stubs | grep 'Version:' | grep -Po '\d+\.\d+\.\d+(\.\d+)?'`
           PACKAGE_VERSION=`echo "${LAST_PACKAGE_VERSION}" | awk 'BEGIN{FS=OFS="."}{$4=$4+1; print $0;}'`
           BOTO3_VERSION=`echo "${PACKAGE_VERSION}" | awk 'BEGIN{FS=OFS="."}{print$1, $2, $3;}'`

diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh
@@ -29,7 +29,6 @@ if [[ `git diff --stat | grep version` != "" ]]; then
     git config --global user.name ${GITHUB_ACTOR}
     git add mypy_boto3_builder/version.py
     git commit -m "Bump version to ${VERSION}"
-    git tag ${VERSION}
     git push https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/vemel/mypy_boto3_builder.git --tags
     git push https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/vemel/mypy_boto3_builder.git HEAD:master
 fi