Updated deployment

Author: jackton1

.github/workflows/deploy.yml

@@ -9,6 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Get branch names
+        id: branch-name
+        uses: tj-actions/[email protected]
 
       - name: Run semver-diff
         id: semver-diff
@@ -34,6 +40,8 @@ jobs:
       - name: bumpversion
         run: |
           make increase-version PART="${{ steps.semver-diff.outputs.release_type }}"
+        env:
+          CURRENT_BRANCH: ${{ steps.branch-name.outputs.tag }}
 
       - name: Build and publish
         run: make release

Makefile

@@ -79,8 +79,11 @@ dist: clean install-deploy  ## builds source and wheel package
 	@pip install twine==3.4.1
 	@python setup.py sdist bdist_wheel
 
-increase-version: guard-PART  ## Increase project version
+increase-version: guard-PART guard-CURRENT_BRANCH  ## Increase project version
+	@git checkout main
 	@bump2version $(PART)
+	@git checkout $(CURRENT_BRANCH)
+	@git merge main
 
 install-wheel:  ## Install wheel
 	@echo "Installing wheel..."