Skip to content

Commit

Permalink
Fix some small errors in contributing.md.
Browse files Browse the repository at this point in the history
  • Loading branch information
nfachan committed Jan 19, 2024
1 parent 1f3bc86 commit ce0f05e
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions doc/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

These are the items we need to do to release:
- Update `CHANGELOG.md`.
- Update `version` in `\[workspace.package\]` in `Cargo.toml`.
- Update `version` in `[workspace.package]` in `Cargo.toml`.
- Commit above changes.
- Tag previous changeset with the version tag.
- Push changesets and tags.
Expand All @@ -15,8 +15,8 @@ the headings to reflect the new release.
### Add Missing Items

The first thing to do when updating the `CHANGELOG.md` is to ensure it is complete.
To do this, look at the `\[Unreleased\]` link at the bottom of the file in your
browser and fill in the missing items in the `\[Unreleaed\]` section. Make sure
To do this, look at the `[Unreleased]` link at the bottom of the file in your
browser and fill in the missing items in the `[Unreleaed]` section. Make sure
you add links to issues when appropriate.

Generally, only add things to `CHANGELOG.md` that you think users would care
Expand All @@ -30,22 +30,24 @@ The second thing to do is to update the headers in `CHANGELOG.md`. This is
mechanical. In the future, we will do this using a tool.

These are the steps to take:
- Go to the bottom of the file and duplicate the `\[unreleased\]` line. In the
- Go to the bottom of the file and duplicate the `[unreleased]` line. In the
bottom copy, change "`unreleased`" to the new version number and change
"`HEAD`" to the new release's tag.
- In the preceding line (for `\[unreleased\]`, change the "from" tag before
- In the preceding line (for `[unreleased]`, change the "from" tag before
"`...HEAD`" to the new release's tag.
- Go back to the top of the file, duplicate the `\[Unreleased\]` header, and
- Go back to the top of the file, duplicate the `[Unreleased]` header, and
put an empty line between the two duplicate headers.
- Change the second duplicate header to contain the version number and the
date, like so:
> ## \[10.3.1\] - 2028-06-26
date:
```
## [10.3.1] - 2028-06-26
```

## Update `version` in `\[workspace.package\]` in `Cargo.toml`.
## Update `version` in `[workspace.package]` in `Cargo.toml`.

This is a mechanical change. In the future, we will do this using a tool.

Edit `Cargo.toml`, find `version` in `\[workspace.package\]`, and change it to
Edit `Cargo.toml`, find `version` in `[workspace.package]`, and change it to
the new version.

## Commit Above Changes
Expand All @@ -57,13 +59,15 @@ changesets using `stg commit -a`. The message should just be `Version XXX`.
## Tag

Tag the last committed changeset with the release's tag. This will be something
like "`v1.2.3`". ```bash
like "`v1.2.3`".
```bash
git tag v1.2.3
```

## Push Changesets and Tags

Ensure that you push, and that you push the tags along with the changesets. We
can do that atomically like this: ```bash
can do that atomically like this:
```bash
git push --atomic origin main v1.2.3
```

0 comments on commit ce0f05e

Please sign in to comment.