Skip to content

Commit 21ffe4b

Browse files
committed
Merge bitcoin-core/secp256k1#1055: Prepare initial release
e025ccd release: prepare for initial release 0.2.0 (Jonas Nick) 6d1784a build: add missing files to EXTRA_DIST (Jonas Nick) 13bf1b6 changelog: make order of change types match keepachangelog.com (Jonas Nick) b1f992a doc: improve release process (Jonas Nick) ad39e2d build: change package version to 0.1.0-dev (Jonas Nick) 90618e9 doc: move CHANGELOG from doc/ to root directory (Jonas Nick) Pull request description: Based on bitcoin#964 ACKs for top commit: sipa: ACK e025ccd Tree-SHA512: b9ab71d7362537d383a32b5e321ef44069f00e3e92340375bcd662267bc5a60c2bad60222998e6602cfac24ad65efb23d772eac37c86065036b90ef090b54c49
2 parents 8c949f5 + e025ccd commit 21ffe4b

File tree

5 files changed

+92
-40
lines changed

5 files changed

+92
-40
lines changed

CHANGELOG.md

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Changelog
2+
3+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
4+
5+
## [Unreleased]
6+
7+
## [0.2.0] - 2022-12-12
8+
9+
### Added
10+
- Added `secp256k1_selftest`, to be used in conjunction with `secp256k1_context_static`.
11+
12+
### Changed
13+
- Enabled modules schnorrsig, extrakeys and ECDH by default in `./configure`.
14+
15+
### Deprecated
16+
- Deprecated context flags `SECP256K1_CONTEXT_VERIFY` and `SECP256K1_CONTEXT_SIGN`. Use `SECP256K1_CONTEXT_NONE` instead.
17+
- Renamed `secp256k1_context_no_precomp` to `secp256k1_context_static`.
18+
19+
### ABI Compatibility
20+
21+
Since this is the first release, we do not compare application binary interfaces.
22+
However, there are unreleased versions of libsecp256k1 that are *not* ABI compatible with this version.
23+
24+
## [0.1.0] - 2013-03-05 to 2021-12-25
25+
26+
This version was in fact never released.
27+
The number was given by the build system since the introduction of autotools in Jan 2014 (ea0fe5a5bf0c04f9cc955b2966b614f5f378c6f6).
28+
Therefore, this version number does not uniquely identify a set of source files.

Makefile.am

+9-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,15 @@ maintainer-clean-local: clean-precomp
216216
clean-precomp:
217217
rm -f $(PRECOMP)
218218

219-
EXTRA_DIST = autogen.sh SECURITY.md
219+
EXTRA_DIST = autogen.sh CHANGELOG.md SECURITY.md
220+
EXTRA_DIST += doc/release-process.md doc/safegcd_implementation.md
221+
EXTRA_DIST += examples/EXAMPLES_COPYING
222+
EXTRA_DIST += sage/gen_exhaustive_groups.sage
223+
EXTRA_DIST += sage/gen_split_lambda_constants.sage
224+
EXTRA_DIST += sage/group_prover.sage
225+
EXTRA_DIST += sage/prove_group_implementations.sage
226+
EXTRA_DIST += sage/secp256k1_params.sage
227+
EXTRA_DIST += sage/weierstrass_prover.sage
220228

221229
if ENABLE_MODULE_ECDH
222230
include src/modules/ecdh/Makefile.am.include

configure.ac

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ AC_PREREQ([2.60])
44
# the API. All changes in experimental modules are treated as
55
# backwards-compatible and therefore at most increase the minor version.
66
define(_PKG_VERSION_MAJOR, 0)
7-
define(_PKG_VERSION_MINOR, 1)
8-
define(_PKG_VERSION_BUILD, 0)
9-
define(_PKG_VERSION_IS_RELEASE, false)
7+
define(_PKG_VERSION_MINOR, 2)
8+
define(_PKG_VERSION_PATCH, 0)
9+
define(_PKG_VERSION_IS_RELEASE, true)
1010

1111
# The library version is based on libtool versioning of the ABI. The set of
1212
# rules for updating the version can be found here:
1313
# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
1414
# All changes in experimental modules are treated as if they don't affect the
1515
# interface and therefore only increase the revision.
16-
define(_LIB_VERSION_CURRENT, 0)
16+
define(_LIB_VERSION_CURRENT, 1)
1717
define(_LIB_VERSION_REVISION, 0)
1818
define(_LIB_VERSION_AGE, 0)
1919

20-
AC_INIT([libsecp256k1],m4_join([.], _PKG_VERSION_MAJOR, _PKG_VERSION_MINOR, _PKG_VERSION_BUILD)m4_if(_PKG_VERSION_IS_RELEASE, [true], [], [-pre]),[https://github.com/bitcoin-core/secp256k1/issues],[libsecp256k1],[https://github.com/bitcoin-core/secp256k1])
20+
AC_INIT([libsecp256k1],m4_join([.], _PKG_VERSION_MAJOR, _PKG_VERSION_MINOR, _PKG_VERSION_PATCH)m4_if(_PKG_VERSION_IS_RELEASE, [true], [], [-dev]),[https://github.com/bitcoin-core/secp256k1/issues],[libsecp256k1],[https://github.com/bitcoin-core/secp256k1])
2121

2222
AC_CONFIG_AUX_DIR([build-aux])
2323
AC_CONFIG_MACRO_DIR([build-aux/m4])

doc/CHANGELOG.md

-22
This file was deleted.

doc/release-process.md

+50-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,52 @@
11
# Release Process
22

3-
1. Open PR to master that
4-
1. adds release notes to `doc/CHANGELOG.md` and
5-
2. if this is **not** a patch release, updates `_PKG_VERSION_{MAJOR,MINOR}` and `_LIB_VERSIONS_*` in `configure.ac`
6-
2. After the PR is merged,
7-
* if this is **not** a patch release, create a release branch with name `MAJOR.MINOR`.
8-
Make sure that the branch contains the right commits.
9-
Create commit on the release branch that sets `_PKG_VERSION_IS_RELEASE` in `configure.ac` to `true`.
10-
* if this **is** a patch release, open a pull request with the bugfixes to the `MAJOR.MINOR` branch.
11-
Also include the release note commit bump `_PKG_VERSION_BUILD` and `_LIB_VERSIONS_*` in `configure.ac`.
12-
4. Tag the commit with `git tag -s vMAJOR.MINOR.PATCH`.
13-
5. Push branch and tag with `git push origin --tags`.
14-
6. Create a new GitHub release with a link to the corresponding entry in `doc/CHANGELOG.md`.
3+
This document outlines the process for releasing versions of the form `$MAJOR.$MINOR.$PATCH`.
4+
5+
We distinguish between two types of releases: *regular* and *maintenance* releases.
6+
Regular releases are releases of a new major or minor version as well as patches of the most recent release.
7+
Maintenance releases, on the other hand, are required for patches of older releases.
8+
9+
You should coordinate with the other maintainers on the release date, if possible.
10+
This date will be part of the release entry in [CHANGELOG.md](../CHANGELOG.md) and it should match the dates of the remaining steps in the release process (including the date of the tag and the GitHub release).
11+
It is best if the maintainers are present during the release, so they can help ensure that the process is followed correctly and, in the case of a regular release, they are aware that they should not modify the master branch between merging the PR in step 1 and the PR in step 3.
12+
13+
This process also assumes that there will be no minor releases for old major releases.
14+
15+
## Regular release
16+
17+
1. Open a PR to the master branch with a commit (using message `"release: prepare for $MAJOR.$MINOR.$PATCH"`, for example) that
18+
* finalizes the release notes in [CHANGELOG.md](../CHANGELOG.md) (make sure to include an entry for `### ABI Compatibility`) and
19+
* updates `_PKG_VERSION_*`, `_LIB_VERSION_*`, and sets `_PKG_VERSION_IS_RELEASE` to `true` in `configure.ac`.
20+
2. After the PR is merged, tag the commit and push it:
21+
```
22+
RELEASE_COMMIT=<merge commit of step 1>
23+
git tag -s v$MAJOR.$MINOR.$PATCH -m "libsecp256k1 $MAJOR.$MINOR.$PATCH" $RELEASE_COMMIT
24+
git push git@github.com:bitcoin-core/secp256k1.git v$MAJOR.$MINOR.$PATCH
25+
```
26+
3. Open a PR to the master branch with a commit (using message `"release: bump version after $MAJOR.$MINOR.$PATCH"`, for example) that sets `_PKG_VERSION_IS_RELEASE` to `false` and `_PKG_VERSION_PATCH` to `$PATCH + 1` and increases `_LIB_VERSION_REVISION`. If other maintainers are not present to approve the PR, it can be merged without ACKs.
27+
4. Create a new GitHub release with a link to the corresponding entry in [CHANGELOG.md](../CHANGELOG.md).
28+
29+
## Maintenance release
30+
31+
Note that bugfixes only need to be backported to releases for which no compatible release without the bug exists.
32+
33+
1. If `$PATCH = 1`, create maintenance branch `$MAJOR.$MINOR`:
34+
```
35+
git checkout -b $MAJOR.$MINOR v$MAJOR.$MINOR.0
36+
git push git@github.com:bitcoin-core/secp256k1.git $MAJOR.$MINOR
37+
```
38+
2. Open a pull request to the `$MAJOR.$MINOR` branch that
39+
* includes the bugfixes,
40+
* finalizes the release notes,
41+
* bumps `_PKG_VERSION_PATCH` and `_LIB_VERSION_REVISION` in `configure.ac` (with commit message `"release: update PKG_ and LIB_VERSION for $MAJOR.$MINOR.$PATCH"`, for example).
42+
3. After the PRs are merged, update the release branch and tag the commit:
43+
```
44+
git checkout $MAJOR.$MINOR && git pull
45+
git tag -s v$MAJOR.$MINOR.$PATCH -m "libsecp256k1 $MAJOR.$MINOR.$PATCH"
46+
```
47+
4. Push tag:
48+
```
49+
git push git@github.com:bitcoin-core/secp256k1.git v$MAJOR.$MINOR.$PATCH
50+
```
51+
5. Create a new GitHub release with a link to the corresponding entry in [CHANGELOG.md](../CHANGELOG.md).
52+
6. Open PR to the master branch that includes a commit (with commit message `"release notes: add $MAJOR.$MINOR.$PATCH"`, for example) that adds release notes to [CHANGELOG.md](../CHANGELOG.md).

0 commit comments

Comments
 (0)