summaryrefslogtreecommitdiffstats
path: root/docs/release-process.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/release-process.md')
-rw-r--r--docs/release-process.md27
1 files changed, 10 insertions, 17 deletions
diff --git a/docs/release-process.md b/docs/release-process.md
index f71a4110..21ff1d87 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -143,23 +143,14 @@ internal processes for accessing the restricted keys.
143*** 143***
144 144
145```sh 145```sh
146# Set the gpg key directory.
147$ export GNUPGHOME=~/.gnupg/repo/
148
149# Verify the listed key is “Repo Maintainer”.
150$ gpg -K
151
152# Pick whatever branch or commit you want to tag.
153$ r=main
154
155# Pick the new version. 146# Pick the new version.
156$ t=1.12.10 147$ t=v2.30
157 148
158# Create the signed tag. 149# Create a new signed tag with the current HEAD.
159$ git tag -s v$t -u "Repo Maintainer <repo@android.kernel.org>" -m "repo $t" $r 150$ ./release/sign-tag.py $t
160 151
161# Verify the signed tag. 152# Verify the signed tag.
162$ git show v$t 153$ git show $t
163``` 154```
164 155
165### Push the new release 156### Push the new release
@@ -168,11 +159,11 @@ Once you're ready to make the release available to everyone, push it to the
168`stable` branch. 159`stable` branch.
169 160
170Make sure you never push the tag itself to the stable branch! 161Make sure you never push the tag itself to the stable branch!
171Only push the commit -- notice the use of `$t` and `$r` below. 162Only push the commit -- note the use of `^0` below.
172 163
173```sh 164```sh
174$ git push https://gerrit-review.googlesource.com/git-repo v$t 165$ git push https://gerrit-review.googlesource.com/git-repo $t
175$ git push https://gerrit-review.googlesource.com/git-repo $r:stable 166$ git push https://gerrit-review.googlesource.com/git-repo $t^0:stable
176``` 167```
177 168
178If something goes horribly wrong, you can force push the previous version to the 169If something goes horribly wrong, you can force push the previous version to the
@@ -195,7 +186,9 @@ You can create a short changelog using the command:
195```sh 186```sh
196# If you haven't pushed to the stable branch yet, you can use origin/stable. 187# If you haven't pushed to the stable branch yet, you can use origin/stable.
197# If you have pushed, change origin/stable to the previous release tag. 188# If you have pushed, change origin/stable to the previous release tag.
198$ git log --format="%h (%aN) %s" --no-merges origin/stable..$r 189# This assumes "main" is the current tagged release. If it's newer, change it
190# to the current release tag too.
191$ git log --format="%h (%aN) %s" --no-merges origin/stable..main
199``` 192```
200 193
201## Project References 194## Project References