|
16 | 16 | Take note of the commit immediately before it (`e4cfbf71f7` here), as the tagged commit (`d7c071e0c4` here) |
17 | 17 | will not appear on the `main` branch. |
18 | 18 |
|
| 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 | + |
19 | 25 | - You need to cherry pick commits from the `main` branch that will go into the `3.0.2` point release, |
20 | 26 | so you can list out the most recent commits on the `main` branch to determine those: |
21 | 27 | ``` |
|
30 | 36 | * e4cfbf71f7 (origin/pd/three-dot-oh-one) chore: back-port catalog limit refactor from enterprise (#26278) |
31 | 37 | ``` |
32 | 38 | 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: |
34 | 40 | ``` |
35 | 41 | git cherry-pick 2ceed952b8 |
36 | 42 | git cherry-pick b41a2d9bc3 |
|
42 | 48 | ``` |
43 | 49 | git push |
44 | 50 | ``` |
| 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. |
45 | 53 |
|
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: |
47 | 56 | ``` |
48 | 57 | git checkout -b hiltontj/three-zero-two |
49 | 58 | ``` |
|
64 | 73 | (replace `3.0.2` with your tag name without the leading `v`) |
65 | 74 |
|
66 | 75 | ``` |
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 |
68 | 77 | ``` |
69 | 78 |
|
70 | 79 | - When satisfied, update `install_influxdb.sh` to use the new version for `INFLUXDB_VERSION` |
|
0 commit comments