Merge remote-tracking branch 'makenew/master'

pureskillgg · Jun 12, 2022 · b5956df · b5956df
2 parents 8a0d2b2 + e046d2b
commit b5956df
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -48,7 +48,12 @@ jobs:
         run: make test
       - name: Build
         run: make build
-      - name: Cut version
+      - name: Cut ${{ github.event.inputs.version }}${{ github.event.client_payload.version }} version
         run: |
-          poetry run bump2version --sign-tags ${{ github.event.inputs.version }}${{ github.event.client_payload.version }}
+          version="${{ github.event.inputs.version }}${{ github.event.client_payload.version }}"
+          if [[ "${version}" =~ [0-9] ]]; then
+            poetry run bump2version --sign-tags --new-version $version major
+          else
+            poetry run bump2version --sign-tags $version
+          fi
           git push && git push --tags
diff --git a/setup.cfg b/setup.cfg
@@ -3,6 +3,15 @@ commit = True
 tag = True
 message = {new_version}
 current_version = 0.3.2
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<n>\d+))?
+serialize = 
+	{major}.{minor}.{patch}{release}{n}
+	{major}.{minor}.{patch}
+
+[bumpversion:part:release]
+values = 
+	b
+	rc
 
 [bumpversion:file:pyproject.toml]
 search = version = "{current_version}"