Skip to content

Commit 55c429c

Browse files
authored
[docs] Readability fixes in release instructions (#904)
* [docs] Readability fixes in release instructions * Simplify * Improve readability in PULL_REQUEST_TEMPLATE.md
1 parent be6c679 commit 55c429c

File tree

2 files changed

+22
-35
lines changed

2 files changed

+22
-35
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
> Please **pick a concise, informative and complete title** for your PR.
22
>
3-
> The title is important because it will appear in [our change log](https://github.com/RaRe-Technologies/smart_open/blob/master/CHANGELOG.md).
3+
> The title is important because it will appear in [`CHANGELOG.md`](/CHANGELOG.md).
4+
5+
46

57
### Motivation
68

@@ -12,6 +14,8 @@
1214
1315
Fixes #{issue_number}
1416

17+
18+
1519
### Tests
1620

1721
> If you're fixing a bug, consider [test-driven development](https://en.wikipedia.org/wiki/Test-driven_development):
@@ -29,6 +33,8 @@ Fixes #{issue_number}
2933
>
3034
> If there are any failures, please fix them before creating the PR (or mark it as WIP, see below).
3135
36+
37+
3238
### Work in progress
3339

3440
> If you're still working on your PR, mark the PR as [draft PR](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request).
@@ -37,6 +43,8 @@ Fixes #{issue_number}
3743
>
3844
> Once it's ready, mark the PR as "ready for review", and ping one of the maintainers (e.g. mpenkov).
3945
46+
47+
4048
### Checklist
4149

4250
> Before you mark the PR as "ready for review", please make sure you have:
@@ -48,6 +56,8 @@ Fixes #{issue_number}
4856
- [ ] Run `python update_helptext.py` in case there are API changes
4957
- [ ] Checked that all unit tests pass
5058

59+
60+
5161
### Workflow
5262

5363
> Please avoid rebasing and force-pushing to the branch of the PR once a review is in progress.

release/README.md

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,13 @@
1-
# Release Scripts
2-
3-
This subdirectory contains various scripts for maintainers.
4-
5-
## Prerequisites
6-
7-
You need a GNU-like environment to run these scripts. I perform the releases
8-
using Ubuntu 18.04, but other O/S like MacOS should also work. The
9-
prerequisites are minimal:
10-
11-
- bash
12-
- git with authentication set up (e.g. via ssh-agent)
13-
- virtualenv
14-
- pip
15-
16-
All of the above are generally freely available, e.g. installable via apt in Ubuntu.
1+
> <img width=40% src="https://github.com/user-attachments/assets/cf8f2fa4-37c1-4e50-9fd8-ab6e3fd705b5">
2+
>
3+
> [*New GitHub Release dialog*](https://github.com/piskvorky/smart_open/releases/new?target=master)
174
185
## Release Procedure
196

20-
> ![New GitHub Release](https://github.com/user-attachments/assets/cf8f2fa4-37c1-4e50-9fd8-ab6e3fd705b5)
21-
> *New GitHub Release dialog*
22-
237
- Check that the [latest commit](https://github.com/piskvorky/smart_open/commits/develop) on `develop` passed all CI.
248
- Run `bash release/release.sh` to update `CHANGELOG.md` and then update `master` branch.
25-
- Create a [new GitHub Release](https://github.com/piskvorky/smart_open/releases/new?target=master).
26-
- Fill in the new version including a `v` prefix and press enter.
9+
- The script opens a new browser tab to the [new GitHub Release dialog](https://github.com/piskvorky/smart_open/releases/new?target=master).
10+
- The new version including a `v` prefix shoulb be pre-filled.
2711
- Confirm that it reads "Excellent! This tag will be created from the target when you publish this release.".
2812
- Select target branch `master`.
2913
- Click "Generate release notes" on the right top.
@@ -33,16 +17,9 @@ All of the above are generally freely available, e.g. installable via apt in Ubu
3317

3418
## Troubleshooting
3519

36-
Ideally, our CI should save you from major boo-boos along the way.
37-
If the build is broken, fix it before even thinking about doing a release.
38-
39-
If anything is wrong with the local release branch (before you call merge.sh), for example:
40-
41-
- Typo in CHANGELOG.md
42-
- Missing entries in CHANGELOG.md
43-
- Wrong version.py number
44-
45-
then just fix it in the release branch before moving on.
46-
47-
Otherwise, it's too late to fix anything for the current release.
48-
Make a bugfix release to fix the problem.
20+
In case of CI/CD rot:
21+
- Fix it using a new PR to `develop`.
22+
- The failed release tag is lost: **never force push git tags!**
23+
- Start the release procedure from scratch and create a new release:
24+
- either make new bugfix release like `7.4.2 -> 7.4.3`
25+
- or make a post-release like `7.4.2 -> 7.4.2.post1`

0 commit comments

Comments
 (0)