Skip to content

Commit f1ba48a

Browse files
committed
doc: update release-process.md
1 parent d6cb4e8 commit f1ba48a

File tree

1 file changed

+27
-23
lines changed

1 file changed

+27
-23
lines changed

doc/release-process.md

Lines changed: 27 additions & 23 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,32 @@ 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 (currently [fanquake](https://github.com/fanquake)): Create detached macOS signatures
149143

144+
cd signapple && git pull (if new macOS codesigner has been appointed then: git clone https://github.com/achow101/signapple && cd applesign)
145+
python3 setup.py install (or `pip install -e .` or `poetry install`)
146+
(If new macOS codesigner has been appointed then: To use the code signing certificate with signapple, the Developer ID Application Certificate must be exported. The Developer ID Application Certificate should be accessible through the Keychain Access app.
147+
Find Developer ID Application Certificate, Control click (or right click) it, and choose the option to export the certificate. Export the certificate as Personal Information Exchange file aka .p12 extension.)
150148
transfer bitcoin-osx-unsigned.tar.gz to macOS for signing
151149
tar xf bitcoin-osx-unsigned.tar.gz
152-
./detached-sig-create.sh -s "Key ID"
150+
./detached-sig-create.sh /path/to/codesign.p12
153151
Enter the keychain password and authorize the signature
154152
Move signature-osx.tar.gz back to the guix-build host
155153

156-
Codesigner only: Sign the windows binaries:
154+
### Windows codesigner only (currently [achow101](https://github.com/achow101)): Create detached Windows signatures
157155

158156
tar xf bitcoin-win-unsigned.tar.gz
159157
./detached-sig-create.sh -key /path/to/codesign.key
160158
Enter the passphrase for the key when prompted
161159
signature-win.tar.gz will be created
162160

163-
Code-signer only: It is advised to test that the code signature attaches properly prior to tagging by performing the `guix-codesign` step.
161+
### Windows and macOS codesigners only: test code signatures
162+
It is advised to test that the code signature attaches properly prior to tagging by performing the `guix-codesign` step.
164163
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.
165164

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

168167
```sh
169168
pushd ./bitcoin-detached-sigs
@@ -178,16 +177,21 @@ git push the current branch and new tag
178177
popd
179178
```
180179

181-
Non-codesigners: wait for Windows/macOS detached signatures:
180+
### Non-codesigners: wait for Windows and macOS detached signatures
182181

183-
- Once the Windows/macOS builds each have 3 matching signatures, they will be signed with their respective release keys.
182+
- Once the Windows and macOS builds each have 3 matching signatures, they will be signed with their respective release keys.
184183
- 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.
185184

186-
Create (and optionally verify) the codesigned outputs:
185+
### Create the codesigned build outputs
187186

188-
- [Codesigning](/contrib/guix/README.md#codesigning)
187+
- [Codesigning build outputs](/contrib/guix/README.md#codesigning-build-outputs)
188+
189+
### Verify other builders' signatures to your own (optional)
190+
191+
- [Add other builders keys to your gpg keyring, and/or refresh keys](/contrib/builder-keys/README.md)
192+
- [Verifying build output attestations](/contrib/guix/README.md#verifying-build-output-attestations)
189193

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

192196
```sh
193197
pushd ./guix.sigs
@@ -197,7 +201,7 @@ git push # Assuming you can push to the guix.sigs tree
197201
popd
198202
```
199203

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

202206
Combine the `all.SHA256SUMS.asc` file from all signers into `SHA256SUMS.asc`:
203207

0 commit comments

Comments
 (0)