Skip to content

Commit 4822886

Browse files
authored
docs: update release.md with additional details (#26427)
1 parent 1f076b6 commit 4822886

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

RELEASE.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
Take note of the commit immediately before it (`e4cfbf71f7` here), as the tagged commit (`d7c071e0c4` here)
1717
will not appear on the `main` branch.
1818

19+
- Open a branch off of the `3.0` branch before proceeding, we will cherry pick the commits for this
20+
release onto the new branch:
21+
```
22+
git checkout -b 3.0/my-branch-name
23+
```
24+
1925
- You need to cherry pick commits from the `main` branch that will go into the `3.0.2` point release,
2026
so you can list out the most recent commits on the `main` branch to determine those:
2127
```
@@ -30,7 +36,7 @@
3036
* e4cfbf71f7 (origin/pd/three-dot-oh-one) chore: back-port catalog limit refactor from enterprise (#26278)
3137
```
3238
For any commits newer than the one previously noted (`e4cfbf71f7`), you will want to cherry pick
33-
them onto the `3.0` branch in the order they were originally applied:
39+
them onto the `3.0/my-branch-name` branch in the order they were originally applied:
3440
```
3541
git cherry-pick 2ceed952b8
3642
git cherry-pick b41a2d9bc3
@@ -42,8 +48,11 @@
4248
```
4349
git push
4450
```
51+
Open a PR from `3.0/my-branch-name` into `3.0` (not `main`) so the changes can be reviewed by
52+
another developer.
4553

46-
- The version needs to be bumped on the `3.0` branch for the new release, so start a new branch
54+
- Once that PR is merged, the version needs to be bumped on the `3.0` branch for the new release, so
55+
start a new branch:
4756
```
4857
git checkout -b hiltontj/three-zero-two
4958
```
@@ -64,7 +73,7 @@
6473
(replace `3.0.2` with your tag name without the leading `v`)
6574

6675
```
67-
curl -LO https://dl.influxdata.com/influxdb/releases/influxdb3-3.0.2_linux_amd64.tar.gz
76+
curl -LO https://dl.influxdata.com/influxdb/releases/influxdb3-core-3.0.2_linux_amd64.tar.gz
6877
```
6978

7079
- When satisfied, update `install_influxdb.sh` to use the new version for `INFLUXDB_VERSION`

0 commit comments

Comments
 (0)