diff options
author | Mike Frysinger <vapier@google.com> | 2022-11-24 13:43:51 +0900 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2022-12-01 00:04:24 +0000 |
commit | 1b8714937c20d43f98bd9ffe498a49fcfb086141 (patch) | |
tree | e975f5937a07d422afdc473db73a8c429f868370 /docs/release-process.md | |
parent | 50a2c0e368c09c34e9b40fb432a29402dd400fbe (diff) | |
download | git-repo-1b8714937c20d43f98bd9ffe498a49fcfb086141.tar.gz |
release-process: update to use ./release/sign-tag.py
We have a helper script for signing releases now, so point the docs
to that rather than the multiple manual steps.
Change-Id: I309e883dbce1894650e31682d9975cf0d6bdeca3
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/352834
Tested-by: Mike Frysinger <vapier@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Diffstat (limited to 'docs/release-process.md')
-rw-r--r-- | docs/release-process.md | 27 |
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 | ||
170 | Make sure you never push the tag itself to the stable branch! | 161 | Make sure you never push the tag itself to the stable branch! |
171 | Only push the commit -- notice the use of `$t` and `$r` below. | 162 | Only 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 | ||
178 | If something goes horribly wrong, you can force push the previous version to the | 169 | If 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 |