Skip to content

Commit 03251b6

Browse files
committed
Merge bitcoin/bitcoin#24594: doc: update release-process.md
ac45a43 doc: update release-process.md (gruve-p) Pull request description: ACKs for top commit: achow101: ACK ac45a43 Tree-SHA512: eb49310e5645fcab47c6a268221b688d0ae4ffb1cc6d66fc097da1feb61aa894fb00065c20cd2413b775b598f8c955d48240608107776e4f1016703d52a81212
2 parents a7f0c37 + ac45a43 commit 03251b6

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

doc/release-process.md

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -110,28 +110,24 @@ against other `guix-attest` signatures.
110110
git -C ./guix.sigs pull
111111
```
112112

113-
### Create the macOS SDK tarball: (first time, or when SDK version changes)
113+
### Create the macOS SDK tarball (first time, or when SDK version changes)
114114

115115
Create the macOS SDK tarball, see the [macdeploy
116116
instructions](/contrib/macdeploy/README.md#deterministic-macos-dmg-notes) for
117117
details.
118118

119-
### Build and attest to build outputs:
119+
### Build and attest to build outputs
120120

121121
Follow the relevant Guix README.md sections:
122122
- [Building](/contrib/guix/README.md#building)
123123
- [Attesting to build outputs](/contrib/guix/README.md#attesting-to-build-outputs)
124124

125-
### Verify other builders' signatures to your own. (Optional)
125+
### Verify other builders' signatures to your own (optional)
126126

127-
Add other builders keys to your gpg keyring, and/or refresh keys: See `../bitcoin/contrib/builder-keys/README.md`.
128-
129-
Follow the relevant Guix README.md sections:
127+
- [Add other builders keys to your gpg keyring, and/or refresh keys](/contrib/builder-keys/README.md)
130128
- [Verifying build output attestations](/contrib/guix/README.md#verifying-build-output-attestations)
131129

132-
### Next steps:
133-
134-
Commit your signature to guix.sigs:
130+
### Commit your non codesigned signature to guix.sigs
135131

136132
```sh
137133
pushd ./guix.sigs
@@ -141,29 +137,27 @@ git push # Assuming you can push to the guix.sigs tree
141137
popd
142138
```
143139

144-
Codesigner only: Create Windows/macOS detached signatures:
145-
- Only one person handles codesigning. Everyone else should skip to the next step.
146-
- Only once the Windows/macOS builds each have 3 matching signatures may they be signed with their respective release keys.
140+
## Codesigning
147141

148-
Codesigner only: Sign the macOS binary:
142+
### macOS codesigner only: Create detached macOS signatures (assuming [signapple](https://github.com/achow101/signapple/) is installed and up to date with master branch)
149143

150-
transfer bitcoin-osx-unsigned.tar.gz to macOS for signing
151144
tar xf bitcoin-osx-unsigned.tar.gz
152-
./detached-sig-create.sh -s "Key ID"
145+
./detached-sig-create.sh /path/to/codesign.p12
153146
Enter the keychain password and authorize the signature
154-
Move signature-osx.tar.gz back to the guix-build host
147+
signature-osx.tar.gz will be created
155148

156-
Codesigner only: Sign the windows binaries:
149+
### Windows codesigner only: Create detached Windows signatures
157150

158151
tar xf bitcoin-win-unsigned.tar.gz
159152
./detached-sig-create.sh -key /path/to/codesign.key
160153
Enter the passphrase for the key when prompted
161154
signature-win.tar.gz will be created
162155

163-
Code-signer only: It is advised to test that the code signature attaches properly prior to tagging by performing the `guix-codesign` step.
156+
### Windows and macOS codesigners only: test code signatures
157+
It is advised to test that the code signature attaches properly prior to tagging by performing the `guix-codesign` step.
164158
However if this is done, once the release has been tagged in the bitcoin-detached-sigs repo, the `guix-codesign` step must be performed again in order for the guix attestation to be valid when compared against the attestations of non-codesigner builds.
165159

166-
Codesigner only: Commit the detached codesign payloads:
160+
### Windows and macOS codesigners only: Commit the detached codesign payloads
167161

168162
```sh
169163
pushd ./bitcoin-detached-sigs
@@ -178,16 +172,21 @@ git push the current branch and new tag
178172
popd
179173
```
180174

181-
Non-codesigners: wait for Windows/macOS detached signatures:
175+
### Non-codesigners: wait for Windows and macOS detached signatures
182176

183-
- Once the Windows/macOS builds each have 3 matching signatures, they will be signed with their respective release keys.
177+
- Once the Windows and macOS builds each have 3 matching signatures, they will be signed with their respective release keys.
184178
- Detached signatures will then be committed to the [bitcoin-detached-sigs](https://github.com/bitcoin-core/bitcoin-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries.
185179

186-
Create (and optionally verify) the codesigned outputs:
180+
### Create the codesigned build outputs
187181

188-
- [Codesigning](/contrib/guix/README.md#codesigning)
182+
- [Codesigning build outputs](/contrib/guix/README.md#codesigning-build-outputs)
183+
184+
### Verify other builders' signatures to your own (optional)
185+
186+
- [Add other builders keys to your gpg keyring, and/or refresh keys](/contrib/builder-keys/README.md)
187+
- [Verifying build output attestations](/contrib/guix/README.md#verifying-build-output-attestations)
189188

190-
Commit your signature for the signed macOS/Windows binaries:
189+
### Commit your codesigned signature to guix.sigs (for the signed macOS/Windows binaries)
191190

192191
```sh
193192
pushd ./guix.sigs
@@ -197,7 +196,7 @@ git push # Assuming you can push to the guix.sigs tree
197196
popd
198197
```
199198

200-
### After 3 or more people have guix-built and their results match:
199+
## After 3 or more people have guix-built and their results match
201200

202201
Combine the `all.SHA256SUMS.asc` file from all signers into `SHA256SUMS.asc`:
203202

0 commit comments

Comments
 (0)