Skip to content

Commit 296e882

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#26598: contrib: remove builder keys
e6864fa contrib: remove builder keys (fanquake) Pull request description: This has been superseded by adding a builder-keys/ directory in guix.sigs, where the presence of keys, and validity of signatures is checked. Preventing issues like missing keys or invalid signatures. New (or exisiting) Guix builders can add their key in the next PR they open adding attestations. Related to issues like #26566, #26563. Also follows up with the comment here: bitcoin/bitcoin#26565 (comment). ACKs for top commit: hebasto: ACK e6864fa, modulo s/update/remove/ in the PR tittle. Tree-SHA512: 095b4cf12ed0baeaf0ee7b8edcb3e2647e9c0f812e8fd63915ddb454f81dacc9c2d2b409de2773b7adb5ff643893d614d8aad1bc44c26da648e1bbbe19e11e05
2 parents 360e047 + e6864fa commit 296e882

File tree

5 files changed

+1
-96
lines changed

5 files changed

+1
-96
lines changed

contrib/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ The [Debian](/contrib/debian) subfolder contains the copyright file.
2626

2727
All other packaging related files can be found in the [bitcoin-core/packaging](https://github.com/bitcoin-core/packaging) repository.
2828

29-
### [Builder keys](/contrib/builder-keys)
30-
PGP keys used for signing Bitcoin Core [release](/doc/release-process.md) results.
31-
3229
### [MacDeploy](/contrib/macdeploy) ###
3330
Scripts and notes for Mac builds.
3431

contrib/builder-keys/README.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

contrib/builder-keys/keys.txt

Lines changed: 0 additions & 57 deletions
This file was deleted.

doc/release-process.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ Follow the relevant Guix README.md sections:
134134

135135
### Verify other builders' signatures to your own (optional)
136136

137-
- [Add other builders keys to your gpg keyring, and/or refresh keys](/contrib/builder-keys/README.md)
138137
- [Verifying build output attestations](/contrib/guix/README.md#verifying-build-output-attestations)
139138

140139
### Commit your non codesigned signature to guix.sigs
@@ -193,7 +192,6 @@ popd
193192

194193
### Verify other builders' signatures to your own (optional)
195194

196-
- [Add other builders keys to your gpg keyring, and/or refresh keys](/contrib/builder-keys/README.md)
197195
- [Verifying build output attestations](/contrib/guix/README.md#verifying-build-output-attestations)
198196

199197
### Commit your codesigned signature to guix.sigs (for the signed macOS/Windows binaries)

test/lint/lint-spelling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from subprocess import check_output, STDOUT, CalledProcessError
1313

1414
IGNORE_WORDS_FILE = 'test/lint/spelling.ignore-words.txt'
15-
FILES_ARGS = ['git', 'ls-files', '--', ":(exclude)build-aux/m4/", ":(exclude)contrib/seeds/*.txt", ":(exclude)depends/", ":(exclude)doc/release-notes/", ":(exclude)src/leveldb/", ":(exclude)src/crc32c/", ":(exclude)src/qt/locale/", ":(exclude)src/qt/*.qrc", ":(exclude)src/secp256k1/", ":(exclude)src/minisketch/", ":(exclude)contrib/builder-keys/keys.txt", ":(exclude)contrib/guix/patches"]
15+
FILES_ARGS = ['git', 'ls-files', '--', ":(exclude)build-aux/m4/", ":(exclude)contrib/seeds/*.txt", ":(exclude)depends/", ":(exclude)doc/release-notes/", ":(exclude)src/leveldb/", ":(exclude)src/crc32c/", ":(exclude)src/qt/locale/", ":(exclude)src/qt/*.qrc", ":(exclude)src/secp256k1/", ":(exclude)src/minisketch/", ":(exclude)contrib/guix/patches"]
1616

1717

1818
def check_codespell_install():

0 commit comments

Comments
 (0)