Skip to content

Commit d7eee4d

Browse files
committed
Updated deployment
1 parent f5b9be0 commit d7eee4d

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

.github/workflows/deploy.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ jobs:
1212
with:
1313
fetch-depth: 0
1414

15-
- name: Get branch names
16-
id: branch-name
17-
uses: tj-actions/[email protected]
18-
1915
- name: Run semver-diff
2016
id: semver-diff
2117
uses: tj-actions/[email protected]
@@ -40,8 +36,6 @@ jobs:
4036
- name: bumpversion
4137
run: |
4238
make increase-version PART="${{ steps.semver-diff.outputs.release_type }}"
43-
env:
44-
CURRENT_BRANCH: ${{ steps.branch-name.outputs.tag }}
4539
4640
- name: Build and publish
4741
run: make release

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,9 @@ dist: clean install-deploy ## builds source and wheel package
7979
@pip install twine==3.4.1
8080
@python setup.py sdist bdist_wheel
8181

82-
increase-version: guard-PART guard-CURRENT_BRANCH ## Increase project version
83-
@git checkout main
82+
increase-version: guard-PART ## Increase project version
8483
@bump2version $(PART)
85-
@git checkout $(CURRENT_BRANCH)
86-
@git merge main
84+
@git switch -c main
8785

8886
install-wheel: ## Install wheel
8987
@echo "Installing wheel..."

0 commit comments

Comments
 (0)