Skip to content

Commit 46ce6ce

Browse files
committed
tree-wide: Rename gitian-keys to builder-keys
1 parent fc4f844 commit 46ce6ce

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

contrib/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ All other packaging related files can be found in the [bitcoin-core/packaging](h
2929
### [Gitian-descriptors](/contrib/gitian-descriptors) ###
3030
Files used during the gitian build process. For more information about gitian, see the [the Bitcoin Core documentation repository](https://github.com/bitcoin-core/docs).
3131

32-
### [Gitian-keys](/contrib/gitian-keys)
33-
PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results.
32+
### [Builder keys](/contrib/builder-keys)
33+
PGP keys used for signing Bitcoin Core [release](/doc/release-process.md) results.
3434

3535
### [MacDeploy](/contrib/macdeploy) ###
3636
Scripts and notes for Mac builds.
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
## PGP keys of Gitian builders and Developers
1+
## PGP keys of builders and Developers
22

3-
The file `keys.txt` contains fingerprints of the public keys of Gitian builders
4-
and active developers.
3+
The file `keys.txt` contains fingerprints of the public keys of builders and
4+
active developers.
55

66
The associated keys are mainly used to sign git commits or the build results
7-
of Gitian builds.
7+
of Guix builds.
88

99
The most recent version of each pgp key can be found on most pgp key servers.
1010

@@ -16,12 +16,12 @@ To fetch the latest version of all pgp keys in your gpg homedir,
1616
gpg --refresh-keys
1717
```
1818

19-
To fetch keys of Gitian builders and active developers, feed the list of
20-
fingerprints of the primary keys into gpg:
19+
To fetch keys of builders and active developers, feed the list of fingerprints
20+
of the primary keys into gpg:
2121

2222
```sh
2323
while read fingerprint keyholder_name; do gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys ${fingerprint}; done < ./keys.txt
2424
```
2525

26-
Add your key to the list if you provided Gitian signatures for two major or
26+
Add your key to the list if you provided Guix attestations for two major or
2727
minor releases of Bitcoin Core.
File renamed without changes.

doc/release-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Build output expected:
169169

170170
### Verify other gitian builders signatures to your own. (Optional)
171171

172-
Add other gitian builders keys to your gpg keyring, and/or refresh keys: See `../bitcoin/contrib/gitian-keys/README.md`.
172+
Add other builders keys to your gpg keyring, and/or refresh keys: See `../bitcoin/contrib/builder-keys/README.md`.
173173

174174
Verify the signatures
175175

test/lint/lint-spelling.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ if ! command -v codespell > /dev/null; then
1515
fi
1616

1717
IGNORE_WORDS_FILE=test/lint/lint-spelling.ignore-words.txt
18-
if ! codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=${IGNORE_WORDS_FILE} $(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/univalue/" ":(exclude)contrib/gitian-keys/keys.txt" ":(exclude)contrib/guix/patches"); then
18+
if ! codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=${IGNORE_WORDS_FILE} $(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/univalue/" ":(exclude)contrib/builder-keys/keys.txt" ":(exclude)contrib/guix/patches"); then
1919
echo "^ Warning: codespell identified likely spelling errors. Any false positives? Add them to the list of ignored words in ${IGNORE_WORDS_FILE}"
2020
fi

0 commit comments

Comments
 (0)