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.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/release-process.md b/docs/release-process.md
index 0df590ac..43209eb0 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -97,7 +97,7 @@ If that tag cannot be verified, it gives up and forces the user to resolve.
97 97
98## Branch management 98## Branch management
99 99
100All development happens on the `master` branch and should generally be stable. 100All development happens on the `main` branch and should generally be stable.
101 101
102Since the repo launcher defaults to tracking the `stable` branch, it is not 102Since the repo launcher defaults to tracking the `stable` branch, it is not
103normally updated until a new release is available. 103normally updated until a new release is available.
@@ -112,7 +112,7 @@ For example, when `stable` moves from `v1.10.x` to `v1.11.x`, then the `maint`
112branch will be updated from `v1.9.x` to `v1.10.x`. 112branch will be updated from `v1.9.x` to `v1.10.x`.
113 113
114We don't have parallel release branches/series. 114We don't have parallel release branches/series.
115Typically all tags are made against the `master` branch and then pushed to the 115Typically all tags are made against the `main` branch and then pushed to the
116`stable` branch to make it available to the rest of the world. 116`stable` branch to make it available to the rest of the world.
117Since repo doesn't typically see a lot of changes, this tends to be OK. 117Since repo doesn't typically see a lot of changes, this tends to be OK.
118 118
@@ -120,10 +120,10 @@ Since repo doesn't typically see a lot of changes, this tends to be OK.
120 120
121When you want to create a new release, you'll need to select a good version and 121When you want to create a new release, you'll need to select a good version and
122create a signed tag using a key registered in repo itself. 122create a signed tag using a key registered in repo itself.
123Typically we just tag the latest version of the `master` branch. 123Typically we just tag the latest version of the `main` branch.
124The tag could be pushed now, but it won't be used by clients normally (since the 124The tag could be pushed now, but it won't be used by clients normally (since the
125default `repo-rev` setting is `stable`). 125default `repo-rev` setting is `stable`).
126This would allow some early testing on systems who explicitly select `master`. 126This would allow some early testing on systems who explicitly select `main`.
127 127
128### Creating a signed tag 128### Creating a signed tag
129 129
@@ -144,7 +144,7 @@ $ export GNUPGHOME=~/.gnupg/repo/
144$ gpg -K 144$ gpg -K
145 145
146# Pick whatever branch or commit you want to tag. 146# Pick whatever branch or commit you want to tag.
147$ r=master 147$ r=main
148 148
149# Pick the new version. 149# Pick the new version.
150$ t=1.12.10 150$ t=1.12.10