Skip to content

Commit

Permalink
Merge pull request #3993 from oasisprotocol/tjanez/release-process-fix
Browse files Browse the repository at this point in the history
docs: Avoid / in backport/changelog git branch names in Release Process
  • Loading branch information
tjanez authored Jun 3, 2021
2 parents fe76a87 + f81c040 commit 9b936ab
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .changelog/3891.doc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Note that `RELEASE_BRANCH` variable needs to be exported in [Release Process]

[Release Process]: docs/release-process.md
3 changes: 0 additions & 3 deletions .changelog/3891.docs.md

This file was deleted.

3 changes: 3 additions & 0 deletions .changelog/3993.doc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Note that `RELEASE_BRANCH` variable needs to be exported in [Release Process]

[Release Process]: docs/release-process.md
8 changes: 4 additions & 4 deletions docs/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ export RELEASE_BRANCH="stable/21.2.x"

### Back-port Changes

Create a new branch, e.g. `${RELEASE_BRANCH}/backport-foo`, from the
Create a new branch, e.g. `${RELEASE_BRANCH}-backport-foo`, from the
`${RELEASE_BRANCH}` branch:

```bash
git checkout -b ${RELEASE_BRANCH}/backport-foo ${RELEASE_BRANCH}
git checkout -b ${RELEASE_BRANCH}-backport-foo ${RELEASE_BRANCH}
```

After back-porting all the desired changes, push it to the origin and make a
Expand All @@ -191,11 +191,11 @@ As with a regular release, the back-ported changes should include the
corresponding [Change Log Fragments] that need to be assembled into a new
section of the [Change Log] using the `changelog` [Make] target.

Create a new branch, e.g. `${RELEASE_BRANCH}/changelog`, from the
Create a new branch, e.g. `${RELEASE_BRANCH}-changelog`, from the
`${RELEASE_BRANCH}` branch:

```bash
git checkout -b ${RELEASE_BRANCH}/changelog ${RELEASE_BRANCH}
git checkout -b ${RELEASE_BRANCH}-changelog ${RELEASE_BRANCH}
```

Then run [Make]'s `changelog` target:
Expand Down

0 comments on commit 9b936ab

Please sign in to comment.