Skip to content

Commit 5e6eb7e

Browse files
committed
Merge pull request #4788 from gyuho/release_doc
Documentation: release with project key
2 parents 3c1dbde + 3e6678a commit 5e6eb7e

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

Documentation/dev/release.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ The procedure includes some manual steps for sanity checking but it can probably
66

77
## Prepare Release
88

9-
Set desired version as environment variable for following steps. Here is an example to release 2.1.3:
9+
Set desired version as environment variable for following steps. Here is an example to release 2.3.0:
1010

1111
```
12-
export VERSION=v2.1.3
13-
export PREV_VERSION=v2.1.2
12+
export VERSION=v2.3.0
13+
export PREV_VERSION=v2.2.5
1414
```
1515

1616
All releases version numbers follow the format of [semantic versioning 2.0.0](http://semver.org/).
@@ -30,7 +30,6 @@ All releases version numbers follow the format of [semantic versioning 2.0.0](ht
3030

3131
## Write Release Note
3232

33-
3433
- Write introduction for the new release. For example, what major bug we fix, what new features we introduce or what performance improvement we make.
3534
- Write changelog for the last release. ChangeLog should be straightforward and easy to understand for the end-user.
3635
- Put `[GH XXXX]` at the head of change line to reference Pull Request that introduces the change. Moreover, add a link on it to jump to the Pull Request.
@@ -61,16 +60,14 @@ It generates all release binaries and images under directory ./release.
6160

6261
## Sign Binaries and Images
6362

64-
Choose appropriate private key to sign the generated binaries and images.
63+
etcd project key must be used to sign the generated binaries and images.`$SUBKEYID` is the key ID of etcd project Yubikey. Connect the key and run `gpg2 --card-status` to get the ID.
6564

6665
The following commands are used for public release sign:
6766

6867
```
6968
cd release
70-
# personal GPG is okay for now
71-
for i in etcd-*{.zip,.tar.gz}; do gpg --sign ${i}; done
72-
# use `CoreOS ACI Builder <[email protected]>` secret key
73-
gpg -u 88182190 -a --output etcd-${VERSION}-linux-amd64.aci.asc --detach-sig etcd-${VERSION}-linux-amd64.aci
69+
for i in etcd-*{.zip,.tar.gz}; do gpg2 --default-key $SUBKEYID --output ${i}.asc --detach-sign ${i}; done
70+
for i in etcd-*{.zip,.tar.gz}; do gpg2 --verify ${i}.asc ${i}; done
7471
```
7572

7673
## Publish Release Page in GitHub

0 commit comments

Comments
 (0)