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 git-repo-1b8714937c20d43f98bd9ffe498a49fcfb086141.zip | |
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 f71a41105..21ff1d873 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -143,23 +143,14 @@ internal processes for accessing the restricted keys. *** ```sh -# Set the gpg key directory. -$ export GNUPGHOME=~/.gnupg/repo/ - -# Verify the listed key is “Repo Maintainer”. -$ gpg -K - -# Pick whatever branch or commit you want to tag. -$ r=main - # Pick the new version. -$ t=1.12.10 +$ t=v2.30 -# Create the signed tag. -$ git tag -s v$t -u "Repo Maintainer <repo@android.kernel.org>" -m "repo $t" $r +# Create a new signed tag with the current HEAD. +$ ./release/sign-tag.py $t # Verify the signed tag. -$ git show v$t +$ git show $t ``` ### Push the new release @@ -168,11 +159,11 @@ Once you're ready to make the release available to everyone, push it to the `stable` branch. Make sure you never push the tag itself to the stable branch! -Only push the commit -- notice the use of `$t` and `$r` below. +Only push the commit -- note the use of `^0` below. ```sh -$ git push https://gerrit-review.googlesource.com/git-repo v$t -$ git push https://gerrit-review.googlesource.com/git-repo $r:stable +$ git push https://gerrit-review.googlesource.com/git-repo $t +$ git push https://gerrit-review.googlesource.com/git-repo $t^0:stable ``` 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: ```sh # If you haven't pushed to the stable branch yet, you can use origin/stable. # If you have pushed, change origin/stable to the previous release tag. -$ git log --format="%h (%aN) %s" --no-merges origin/stable..$r +# This assumes "main" is the current tagged release. If it's newer, change it +# to the current release tag too. +$ git log --format="%h (%aN) %s" --no-merges origin/stable..main ``` ## Project References |