Skip to content

Commit e6864fa

Browse files
committed
contrib: remove builder keys
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.
1 parent 8ab1923 commit e6864fa

File tree

5 files changed

+1
-96
lines changed

5 files changed

+1
-96
lines changed

contrib/README.md

-3
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

-33
This file was deleted.

contrib/builder-keys/keys.txt

-57
This file was deleted.

doc/release-process.md

-2
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

+1-1
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)