Skip to content

Commit

Permalink
Update release_process.md: use single-digit versioning for hot-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
groovecoder authored Aug 18, 2023
1 parent ffd15ee commit 7c8b595
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions docs/release_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ GitHub Flow:
3. Create a pull request to `main`
4. Address review comments
5. Merge pull request
6. Make and push a new tag. E.g.: `2022.08.02.01`
6. Make and push a new tag. E.g.: `2022.08.02.1`

```mermaid
%%{init: { 'theme': 'base' } }%%
Expand All @@ -196,7 +196,7 @@ GitHub Flow:
branch stage-fix-2022.08.02
commit
checkout main
merge stage-fix-2022.08.02 tag: "2022.08.02.01"
merge stage-fix-2022.08.02 tag: "2022.08.02.1"
```

### "Dirty `main`" flow
Expand Down Expand Up @@ -237,7 +237,7 @@ from the stage-fix branch.
commit
checkout main
branch stage-fix-2022.08.02
commit tag: "2022.08.02.01"
commit tag: "2022.08.02.1"
checkout main
merge change-3
merge stage-fix-2022.08.02
Expand All @@ -249,8 +249,8 @@ Whether you make a "clean" or "dirty" stage-fix, after you push the new tag to
GitHub, you should [make a pre-release on GitHub][github-new-release] for the
new release tag.

1. Choose the tag you just pushed (e.g., `2022.08.02.01`)
2. Type the same tag name for the releae title (e.g., `2022.08.02.01`)
1. Choose the tag you just pushed (e.g., `2022.08.02.1`)
2. Type the same tag name for the releae title (e.g., `2022.08.02.1`)
3. Click "Previous tag:" and choose the previous tag. (e.g., `2022.08.02`)
4. Click the "Generate release notes" button!
5. Check the pre-release box.
Expand Down Expand Up @@ -282,7 +282,7 @@ new release tag.
branch stage-fix-1
commit
checkout main
merge stage-fix-1 tag: "2022.08.02.01"
merge stage-fix-1 tag: "2022.08.02.1"
checkout main
merge change-3
branch change-4
Expand Down

0 comments on commit 7c8b595

Please sign in to comment.