Skip to content

Commit 6348bc7

Browse files
committed
release process: fix process for maintenance release
1 parent 79fa50b commit 6348bc7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

doc/release-process.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ gcc -o ecdsa examples/ecdsa.c -I $dir/include -L $dir/lib*/ -l secp256k1 -Wl,-rp
6060

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

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

0 commit comments

Comments
 (0)