File tree Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -17,16 +17,25 @@ Note that throughout this guide, the `upstream` remote refers to the `operator-f
17
17
The release process differs slightly based on whether a patch or major/minor release is being made.
18
18
19
19
### Patch Release
20
- #### Step 1
21
- In this example we will be creating a new patch release from version ` v1.2.3 ` , on the branch ` release-v1.2 ` .
22
- First ensure that the release branch has been updated on remote with the changes from the patch, then perform the following:
20
+
21
+ In this example, we will be creating a new patch release from version ` v1.2.3 ` on the branch ` release-v1.2 ` .
22
+
23
+ #### Step 1
24
+ First, make sure the ` release-v1.2 ` branch is updated with the latest changes from upstream:
23
25
``` bash
24
26
git fetch upstream release-v1.2
25
- git pull release-v1.2
26
27
git checkout release-v1.2
28
+ git reset --hard upstream/release-v1.2
27
29
```
28
30
29
31
#### Step 2
32
+ Run the following command to confirm that your local branch has the latest expected commit:
33
+ ``` bash
34
+ git log --oneline -n 5
35
+ ```
36
+ Check that the most recent commit matches the latest commit in the upstream ` release-v1.2 ` branch.
37
+
38
+ #### Step 3
30
39
Create a new tag, incrementing the patch number from the previous version. In this case, we'll be incrementing from ` v1.2.3 ` to ` v1.2.4 ` :
31
40
``` bash
32
41
# # Previous version was v1.2.3, so we bump the patch number up by one
You can’t perform that action at this time.
0 commit comments