Skip to content

Commit cbb7edd

Browse files
committed
Using git directly
1 parent 0222f68 commit cbb7edd

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

.github/workflows/docs.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,17 @@ jobs:
6767
- name: Merge main to stable and push tags
6868
if: ${{ !inputs.candidate && !inputs.test_pypi }}
6969
run: |
70-
make check-release
71-
make git-merge-main-stable
70+
make check-clean
71+
make check-candidate
72+
make check-history
73+
git checkout stable-clone || git checkout -b stable-clone
74+
git merge --no-ff main-clone -m"make release-tag: Merge branch 'main' into stable"
7275
make bumpversion-release
73-
make git-push-tags-stable
76+
git push --tags origin stable-clone
7477
7578
- name: Create wheel
7679
run: |
77-
make check-branch
78-
make check-main
80+
git checkout main-clone
7981
make dist
8082
8183
- name: Publish a Python distribution to PyPI
@@ -93,6 +95,7 @@ jobs:
9395
- name: Merge to main and bump to next patch
9496
if: ${{ !inputs.candidate && !inputs.test_pypi}}
9597
run: |
96-
make git-merge-stable-main
98+
git checkout main-clone
99+
git merge stable-clone
97100
make bumpversion-patch
98101
make git-push

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,3 @@ release-candidate: check-main publish bumpversion-candidate git-push
262262

263263
.PHONY: release-candidate-test
264264
release-candidate-test: check-clean check-main publish-test
265-
266-
.PHONY: check-branch
267-
check-branch:
268-
@echo $(CURRENT_BRANCH)

0 commit comments

Comments
 (0)