Skip to content

Commit b9b8c90

Browse files
authored
Merge pull request #532 from nebari-dev/develop-to-main
support develop to main rename on nebari repo
2 parents 5bae77f + 67fc433 commit b9b8c90

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

docs/community/maintainers/release-process.md

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,15 @@ For example, the first Nebari CalVer release was `2022.10.1`. If a hotfix releas
4747

4848
We use the following guidelines to manage `git` branches by assigning certain roles to particular branches.
4949

50-
- [`develop`](https://github.com/nebari-dev/nebari/tree/develop) - Represents the active development branch and is the _default_ branch on the GitHub repository.
50+
- [`main`](https://github.com/nebari-dev/nebari/tree/main) - Represents the active development branch and is the _default_ branch on the GitHub repository.
5151

52-
- [`main`](https://github.com/nebari-dev/nebari/tree/main) - Represents a production-ready state of the code-base, with an appropriate tag to match the most recent release.
52+
## Release Tags
5353

54-
- `release/YYYY-MM-releaseNumber` - Represents the branch for the upcoming release and only briefly exist while actively preparing for the release.
54+
- `YYYY-MM-releaseNumber` - Represents the tag for a particular release.
5555

5656
### Process
5757

58-
Although this process is captured in the [release checklist template](https://github.com/nebari-dev/nebari/issues/new?assignees=&labels=type%3A+release+%F0%9F%8F%B7&template=release-checklist.md&title=%5BRELEASE%5D+%3Cversion%3E), it's worth making clear how branches are managed.
59-
60-
- Active development occurs against the `develop` branch.
61-
- When it's time for a release, the Release Captain will create the release branch `release/YYYY-MM-releaseNumber` and prepare the branch for the release. At times, this might mean cherry-picking commits that are needed for this release and at other times, this might mean merging `develop` into this release branch.
62-
- As soon as this release branch is ready, the Release Captain can open a pull request against `main`. From here, all of the changes that are included in the release should be visible in the "Files changed" section of the pull request.
63-
- Once CI passes, all manual tests are successful and the team is happy with the changes, the Release Captain can complete the release checklist and cut the release.
64-
65-
#### Hotfixes
66-
67-
In the event that a patch or hotfix release is needed, release process is the same as outlined above. The only difference is that the commits that are merged into the hotfix release branch will need to be cherry-picked from the `develop` branch.
58+
The release process is captured in the [release checklist template](https://github.com/nebari-dev/nebari/blob/main/.github/ISSUE_TEMPLATE/release-checklist.md). In the event that a patch or hotfix release is needed, release process is the same as outlined above.
6859

6960
## Related packages
7061

docs/community/maintainers/reviewer-guidelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Only maintainers can merge pull requests. Please follow these guidelines:
6262
- If the contribution is made to the `nebari-dev/nebari` repository, then you'll need to trigger the Kubernetes tests
6363
by commenting `/bot run tests` on the PR.
6464
- If the contribution is made to the `nebari-dev/nebari-docs` repository, then make sure to check the Netlify build and preview.
65-
- In case of merge conflicts, ask the PR submitter to rebase on `develop`.
65+
- In case of merge conflicts, ask the PR submitter to rebase on `main`.
6666
- Squashing commits or cleaning up commit messages of a PR that you consider too messy is OK.
6767
Remember to retain the original author’s name when doing this.
6868
- When you want to reject a PR: if it’s very straightforward, you can close it and explain why. If it’s not,

0 commit comments

Comments
 (0)