@@ -81,7 +81,7 @@ The following changes should be present:
81
81
- ` website/content/en/docs/upgrading-sdk-version/v1.3.0.md ` : commit changes (created by changelog generation).
82
82
- ` website/config.toml ` : commit changes (modified by release script).
83
83
84
- Commit these changes and push:
84
+ Commit these changes and push to your remote (assuming your remote is named ` origin ` ) :
85
85
86
86
``` sh
87
87
git add --all
@@ -98,9 +98,14 @@ if you have admin access to the operator-sdk repo, or ask an administrator to do
98
98
99
99
Unlock the branch by changing the number of required approving reviewers in the ` master ` branch rule back to 1.
100
100
101
- ### 4. Create and push a release tag
101
+ ### 4. Create and push a release tag on ` master `
102
+
103
+ Refresh your local ` master ` branch, tag the release PR commit, and push to the main operator-sdk repo
104
+ (assumes the remote's name is ` upstream ` ):
102
105
103
106
``` sh
107
+ git checkout master
108
+ git pull
104
109
make tag
105
110
git push upstream refs/tags/$RELEASE_VERSION
106
111
```
@@ -112,15 +117,15 @@ Run the following commands to do so:
112
117
113
118
``` sh
114
119
git checkout latest
115
- git reset --hard tags/$RELEASE_VERSION
120
+ git reset --hard refs/ tags/$RELEASE_VERSION
116
121
git push -f upstream latest
117
122
```
118
123
119
124
Similarly, to update the release branch, run:
120
125
121
126
``` sh
122
127
git checkout v1.3.x
123
- git reset --hard tags/$RELEASE_VERSION
128
+ git reset --hard refs/ tags/$RELEASE_VERSION
124
129
git push -f upstream v1.3.x
125
130
```
126
131
@@ -161,12 +166,12 @@ git checkout -b release-$RELEASE_VERSION
161
166
Using the version for your release as the IMAGE_VERSION, execute the
162
167
following commands from the root of the project.
163
168
164
- ``` sh
165
- # Update the IMAGE_VERSION in the Makefile
169
+ ``` sh
170
+ # Update the IMAGE_VERSION in the Makefile
166
171
sed -i -E ' s/(IMAGE_VERSION = ).+/\1v1\.3\.1/g' Makefile
167
172
# Run the pre-release `make` target:
168
173
make prerelease
169
- # Regenerate testdata (samples).
174
+ # Regenerate testdata (samples).
170
175
# NOTE: The sanity test will fail but scaffolding should complete.
171
176
make test-sanity
172
177
```
@@ -188,7 +193,7 @@ git push -u origin release-$RELEASE_VERSION
188
193
189
194
#### 3. Create and merge Pull Request
190
195
191
- - Create a pull request against the ` v1.3.x ` branch.
196
+ - Create a pull request against the ` v1.3.x ` branch.
192
197
- Once approving review is given, merge. You may have to unlock the branch by setting
193
198
"required approving reviewers" to back to ` 1 ` . (See step 0).
194
199
@@ -207,7 +212,7 @@ git push upstream refs/tags/$RELEASE_VERSION
207
212
208
213
If the patch release is on the latest y-stream (in the example you would
209
214
not ff latest if there was a y-stream for v1.4.x), you will need to
210
- fast-forward the ` latest ` git branch.
215
+ fast-forward the ` latest ` git branch.
211
216
212
217
(The ` latest ` branch points to the latest release tag to keep the main website subdomain up-to-date.)
213
218
0 commit comments