Skip to content

Commit

Permalink
contrib: remove builder keys
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
fanquake committed Dec 19, 2022
1 parent 8ab1923 commit e6864fa
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 96 deletions.
3 changes: 0 additions & 3 deletions contrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ The [Debian](/contrib/debian) subfolder contains the copyright file.

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

### [Builder keys](/contrib/builder-keys)
PGP keys used for signing Bitcoin Core [release](/doc/release-process.md) results.

### [MacDeploy](/contrib/macdeploy) ###
Scripts and notes for Mac builds.

Expand Down
33 changes: 0 additions & 33 deletions contrib/builder-keys/README.md

This file was deleted.

57 changes: 0 additions & 57 deletions contrib/builder-keys/keys.txt

This file was deleted.

2 changes: 0 additions & 2 deletions doc/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ Follow the relevant Guix README.md sections:

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

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

### Commit your non codesigned signature to guix.sigs
Expand Down Expand Up @@ -193,7 +192,6 @@ popd

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

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

### Commit your codesigned signature to guix.sigs (for the signed macOS/Windows binaries)
Expand Down
2 changes: 1 addition & 1 deletion test/lint/lint-spelling.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from subprocess import check_output, STDOUT, CalledProcessError

IGNORE_WORDS_FILE = 'test/lint/spelling.ignore-words.txt'
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"]
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"]


def check_codespell_install():
Expand Down

0 comments on commit e6864fa

Please sign in to comment.