Skip to content

Commit bd5ae6c

Browse files
committed
doc: misc changes in release-process
Nobody is pushing direct to guix.sigs, nor should they, as that bypasses CI. Use a newer example for the testing issue. Don't duplicate the bitcoincore.org doc instructions.
1 parent d99ba3c commit bd5ae6c

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

doc/release-process.md

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Release Process
5757
- Update the versions.
5858
- Create the draft, named "*version* Release Notes Draft", as a [collaborative wiki](https://github.com/bitcoin-core/bitcoin-devwiki/wiki/_new).
5959
- Clear the release notes: `cp doc/release-notes-empty-template.md doc/release-notes.md`
60-
- Create a pinned meta-issue for testing the release candidate (see [this issue](https://github.com/bitcoin/bitcoin/issues/17079) for an example) and provide a link to it in the release announcements where useful.
60+
- Create a pinned meta-issue for testing the release candidate (see [this issue](https://github.com/bitcoin/bitcoin/issues/27621) for an example) and provide a link to it in the release announcements where useful.
6161
- Translations on Transifex
6262
- Change the auto-update URL for the new major version's resource away from `master` and to the branch, e.g. `https://raw.githubusercontent.com/bitcoin/bitcoin/<branch>/src/qt/locale/bitcoin_en.xlf`. Do not forget this or it will keep tracking the translations on master instead, drifting away from the specific major release.
6363
- Prune inputs from the qa-assets repo (See [pruning
@@ -72,7 +72,7 @@ Release Process
7272

7373
To tag the version (or release candidate) in git, use the `make-tag.py` script from [bitcoin-maintainer-tools](https://github.com/bitcoin-core/bitcoin-maintainer-tools). From the root of the repository run:
7474

75-
../bitcoin-maintainer-tools/make-tag.py v(new version, e.g. 23.0)
75+
../bitcoin-maintainer-tools/make-tag.py v(new version, e.g. 25.0)
7676

7777
This will perform a few last-minute consistency checks in the build system files, and if they pass, create a signed tag.
7878

@@ -98,7 +98,7 @@ For the period during which the notes are being edited on the wiki, the version
9898

9999
Generate list of authors:
100100

101-
git log --format='- %aN' v(current version, e.g. 24.0)..v(new version, e.g. 24.1) | grep -v 'merge-script' | sort -fiu
101+
git log --format='- %aN' v(current version, e.g. 25.0)..v(new version, e.g. 25.1) | grep -v 'merge-script' | sort -fiu
102102

103103
### Setup and perform Guix builds
104104

@@ -107,7 +107,7 @@ Checkout the Bitcoin Core version you'd like to build:
107107
```sh
108108
pushd ./bitcoin
109109
SIGNER='(your builder key, ie bluematt, sipa, etc)'
110-
VERSION='(new version without v-prefix, e.g. 24.0)'
110+
VERSION='(new version without v-prefix, e.g. 25.0)'
111111
git fetch origin "v${VERSION}"
112112
git checkout "v${VERSION}"
113113
popd
@@ -142,10 +142,11 @@ Follow the relevant Guix README.md sections:
142142
pushd ./guix.sigs
143143
git add "${VERSION}/${SIGNER}"/noncodesigned.SHA256SUMS{,.asc}
144144
git commit -m "Add attestations by ${SIGNER} for ${VERSION} non-codesigned"
145-
git push # Assuming you can push to the guix.sigs tree
146145
popd
147146
```
148147

148+
Then open a Pull Request to the [guix.sigs repository](https://github.com/bitcoin-core/guix.sigs).
149+
149150
## Codesigning
150151

151152
### macOS codesigner only: Create detached macOS signatures (assuming [signapple](https://github.com/achow101/signapple/) is installed and up to date with master branch)
@@ -200,10 +201,11 @@ popd
200201
pushd ./guix.sigs
201202
git add "${VERSION}/${SIGNER}"/all.SHA256SUMS{,.asc}
202203
git commit -m "Add attestations by ${SIGNER} for ${VERSION} codesigned"
203-
git push # Assuming you can push to the guix.sigs tree
204204
popd
205205
```
206206

207+
Then open a Pull Request to the [guix.sigs repository](https://github.com/bitcoin-core/guix.sigs).
208+
207209
## After 3 or more people have guix-built and their results match
208210

209211
Combine the `all.SHA256SUMS.asc` file from all signers into `SHA256SUMS.asc`:
@@ -266,17 +268,7 @@ cat "$VERSION"/*/all.SHA256SUMS.asc > SHA256SUMS.asc
266268

267269
- bitcoincore.org RPC documentation update
268270

269-
- Install [golang](https://golang.org/doc/install)
270-
271-
- Install the new Bitcoin Core release
272-
273-
- Run bitcoind on regtest
274-
275-
- Clone the [bitcoincore.org repository](https://github.com/bitcoin-core/bitcoincore.org)
276-
277-
- Run: `go run generate.go` while being in `contrib/doc-gen` folder, and with bitcoin-cli in PATH
278-
279-
- Add the generated files to git
271+
- See https://github.com/bitcoin-core/bitcoincore.org/blob/master/contrib/doc-gen/
280272

281273
- Update packaging repo
282274

0 commit comments

Comments
 (0)