Skip to content

Commit 7182e5f

Browse files
committed
chore: update guidelines for publish workflow
1 parent 851e59b commit 7182e5f

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3535
!!! danger
3636
**This version has security vulnerabilities, please stop using it.**
3737

38-
[unreleased]: https://github.com/WSH032/fastapi-proxy-lib/compare/v0.0.1b0...HEAD
38+
[unreleased]: https://github.com/WSH032/fastapi-proxy-lib/tree/HEAD
3939
[0.0.1b0]: https://github.com/WSH032/fastapi-proxy-lib/releases/tag/v0.0.1b0

CONTRIBUTING.md

+15-5
Original file line numberDiff line numberDiff line change
@@ -156,27 +156,37 @@ Please check whether the `ver_sync` works properly, then you can accept the PR.
156156

157157
## Publish and Release 🚀
158158

159-
**^^First, edit `CHANGELOG.md` to record the changes.^^**
159+
**^^First, check-out to a new branch, edit `CHANGELOG.md` to record the changes.^^**
160160

161161
Then, please refer to:
162162

163163
- `.github/workflows/publish.yml`
164164
- <https://github.com/frankie567/hatch-regex-commit>
165165
- <https://hatch.pypa.io/latest/version/#updating>
166166

167-
Update version with:
167+
Update version in **^^new branch^^** with:
168168

169169
```shell
170+
git add .
170171
hatch version {new_version}
171172
```
172173

173-
It will create a commit and tag automatically, then, push the **tag** to GitHub.
174+
It will create a commit and tag automatically.
175+
176+
Then, push the **new branch** with **tag** to GitHub, and create a PR to `main` branch.
177+
178+
!!! warning
179+
The `bump version` PR must have **only one commit with the corresponding tag**; otherwise, it will be rejected.
180+
181+
Review the PR, if it's ok, **rebase** it to `main` branch **^^in local^^**
174182

175183
!!! warning
176-
You should tag in another branch, then rebase it to `main` branch **in local**.<br>
177184
**DO NOT rebase with tag in GitHub**, refer to <https://docs.github.com/zh/authentication/managing-commit-signature-verification/about-commit-signature-verification#signature-verification-for-rebase-and-merge>
178185

179-
Check if everything is ok, for example, **check if the tag is on the `main` branch**.
186+
Check if everything is ok, for example:
187+
188+
- **check if the tag is on the `main` branch**.
189+
- check if the link in `CHANGELOG.md` is correct.
180190

181191
If so, make a `approve` in environment `pypi` for the workflow.
182192

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ commit_message = "chore(version): 🚀 bump version v{current_version} → v{new
7474
tag_message = "🚀 bump version v{current_version} → v{new_version}"
7575
# NOTE: `v` prefix is required by github `publish.yml` action
7676
tag_name = "v{new_version}"
77+
check_dirty = false
7778

7879

7980
[tool.hatch.envs.default]

0 commit comments

Comments
 (0)