Skip to content

Commit d478fe2

Browse files
authored
Merge pull request #334 from ruck94301/doc-add-missing-commit-step-to-internal-md
Add commit step before tagging to internal.md.
2 parents 2bbe2ef + d46b75b commit d478fe2

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

docs/contributing/internal.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,20 @@ environment](./setup.md) set up properly. Then, follow these instructions.
5757
4. Update the changelog in `docs/changelog.md`. After updating the changelog,
5858
run `nox -s docs` to ensure that the docs are built properly.
5959

60-
5. Create a tag for the new version.
60+
5. Commit changes.
61+
62+
Commit like
63+
```console
64+
$ git add <args>
65+
$ git commit -m "Bump version to 2.4.0 and update changelog"
66+
```
67+
Note it's important to commit before tagging, because a git tag is a
68+
fixed pointer to a specific commit in history. It you run
69+
"git tag v2.4.0" without first commiting changes, then the tag will
70+
point to the previous commit; it will refer to the state of the repo
71+
before bumping the version and updating the changelog.
72+
73+
6. Create a tag for the new version.
6174

6275
Note that the Git tag DOES contain the leading "v". For example, if the new
6376
version is `2.4.0`, then run:
@@ -66,17 +79,17 @@ environment](./setup.md) set up properly. Then, follow these instructions.
6679
$ git tag v2.4.0
6780
```
6881

69-
6. Push the branch and the new tag to GitHub.
82+
7. Push the branch and the new tag to GitHub.
7083

7184
```console
7285
$ git push -u origin release-v2.4.0
7386
$ git push origin v2.4.0
7487
```
7588

76-
7. Open a Pull Request for the new release branch, then wait for the test suite
89+
8. Open a Pull Request for the new release branch, then wait for the test suite
7790
to pass. Do not merge the PR yet.
7891

79-
8. Go to the LabGym homepage, then click "Releases", then click "Draft a new
92+
9. Go to the LabGym homepage, then click "Releases", then click "Draft a new
8093
release".
8194

8295
Under "Choose a tag", select the tag that you pushed. Then, click
@@ -87,7 +100,7 @@ environment](./setup.md) set up properly. Then, follow these instructions.
87100
Package Index (PyPI). For more information, see [CI/CD
88101
Pipeline](#ci-cd-pipeline).
89102

90-
9. After verifying that the deployment is successful, merge the release PR
103+
10. After verifying that the deployment is successful, merge the release PR
91104
into `master`.
92105

93106
## CI/CD Pipeline

0 commit comments

Comments
 (0)