@@ -10,9 +10,12 @@
1010 2. Tag it with the new `<integer>` (`docker tag`)
1111 3. Push the new tag (`docker push`)
1212 3. Update docs where the tags are referenced.
13−3. Merge the `develop` branch into `master`.
14−4. CI will automatically create a new release in GitHub with _octo CLI_ and update the `latest` tag for both `octo` and `octopod`. Wait for CI to complete.
15−5. Edit the created release in GitHub to match the version you are releasing.
13+3. Merge the `develop` branch into the `staging` branch.
14+4. CI will automatically update the `latest` tag for both `octo` and `octopod`. Wait for CI to complete.
15+5. Deploy everything in our private cluser and make sure everything works.
16+6. Merge the `staging` branch into `master` using **Rebase and Merge**.
17+7. CI will automatically create a new release in GitHub with _octo CLI_ and update the `latest` tag for both `octo` and `octopod`. Wait for CI to complete.
18+8. Edit the created release in GitHub to match the version you are releasing.
1619 1. Change the release name to the version being released.
1720 2. Uncheck "This is a pre-release"
18−6. Push the new release of `octo` and `octopod`. To do this run `./release.sh <version>`.
21+9. Push the new release of `octo` and `octopod`. To do this run `./release.sh <version>`.