Skip to content

Commit 2e5533e

Browse files
committed
release process: fix process for maintenance release
1 parent ed9c3b6 commit 2e5533e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

doc/release-process.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ gcc -o ecdsa examples/ecdsa.c -I $dir/include -L $dir/lib*/ -l secp256k1 -Wl,-rp
5959

6060
Note that bugfixes only need to be backported to releases for which no compatible release without the bug exists.
6161

62-
1. If `$PATCH = 1`, create maintenance branch `$MAJOR.$MINOR`:
62+
1. If there's no maintenance branch `$MAJOR.$MINOR`, create one:
6363
```
64-
git checkout -b $MAJOR.$MINOR v$MAJOR.$MINOR.0
64+
git checkout -b $MAJOR.$MINOR v$MAJOR.$MINOR.$((PATCH - 1))
6565
git push git@github.com:bitcoin-core/secp256k1.git $MAJOR.$MINOR
6666
```
6767
2. Open a pull request to the `$MAJOR.$MINOR` branch that
6868
* includes the bugfixes,
69-
* finalizes the release notes,
69+
* finalizes the release notes similar to a regular release,
7070
* increments `_PKG_VERSION_PATCH` and `_LIB_VERSION_REVISION` in `configure.ac`
7171
and the `$PATCH` component of `project(libsecp256k1 VERSION ...)` and `${PROJECT_NAME}_LIB_VERSION_REVISION` in `CMakeLists.txt`
7272
(with commit message `"release: bump versions for $MAJOR.$MINOR.$PATCH"`, for example).

0 commit comments

Comments
 (0)