Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add release process reference guide #230

Merged
merged 24 commits into from
Dec 9, 2022
Merged

Add release process reference guide #230

merged 24 commits into from
Dec 9, 2022

Conversation

iameskild
Copy link
Member

Reference Issues or PRs

What does this implement/fix?

Put a x in the boxes that apply

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds a feature)
  • Breaking change (fix or feature that would cause existing features not to work as expected)
  • Documentation Update
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no API changes)
  • Build related changes
  • Other (please describe):

Testing

  • Did you test the pull request locally?
  • Did you add new tests?

Documentation

Access-centered content checklist

Text styling

  • The content is written with plain language (where relevant).
  • If there are headers, they use the proper header tags (with only one level-one header: H1 or # in markdown).
  • All links describe where they link to (for example, check the Nebari website).
  • This content adheres to the Nebari style guides.

Non-text content

  • All content is represented as text (for example, images need alt text, and videos need captions or descriptive transcripts).
  • If there are emojis, there are not more than three in a row.
  • Don't use flashing GIFs or videos.
  • If the content were to be read as plain text, it still makes sense, and no information is missing.

Any other comments?

@iameskild iameskild requested a review from trallard November 22, 2022 14:15
@netlify
Copy link

netlify bot commented Nov 22, 2022

Deploy Preview for nebari-docs ready!

Name Link
🔨 Latest commit 1fa39f4
🔍 Latest deploy log https://app.netlify.com/sites/nebari-docs/deploys/63936e954bd09f00087b8447
😎 Deploy Preview https://deploy-preview-230--nebari-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@iameskild
Copy link
Member Author

@trallard @pavithraes I moved the release process doc to the community section and updated the Gitflow section to reflect what we discussed during the Nebari sync.

docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
@trallard
Copy link
Member

Left several comments here, stuff that I think is missing:

From the checklist

- [ ] [Cut PyPI release via GHA release workflow.](https://github.com/nebari-dev/nebari/releases/new)
  - Avoid appending `v` to the tag.
    - Copy release notes from `RELEASE.md`.
  • Also, where are the release notes copied to or from?

@pavithraes
Copy link
Member

Also, where are the release notes copied to or from?

The actual release notes are recorded at: https://github.com/nebari-dev/nebari/blob/release/2022.11.1/RELEASE.md

We want to copy these to: https://www.nebari.dev/docs/references/RELEASE

I do have a PR open to copy these over automatically on each release: nebari-dev/nebari#1554

iameskild and others added 11 commits November 23, 2022 22:09
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
@iameskild
Copy link
Member Author

iameskild commented Nov 23, 2022

Thanks for the review @trallard! I believe I addressed all of the concerns above.

From the checklist

- [ ] [Cut PyPI release via GHA release workflow.](https://github.com/nebari-dev/nebari/releases/new)
  - Avoid appending `v` to the tag.
    - Copy release notes from `RELEASE.md`.

We don't need to manually create any tags as it is handled by GitHub's release process (which is where we link to) :)

@pavithraes
Copy link
Member

Thanks for working on this page, Eskild. I think it's looking great!

@iameskild
Copy link
Member Author

@trallard @pavithraes as I have been writing up these docs and trying to think through how (existing and new) contributors will likely work, I'm starting to have some reservations about the Bokeh style gitflow workflow. There are a few places where this gitflow workflow is not entirely intuitive and will likely cause some confusion. A few examples of this include:

  • not knowing which branch to branch off
    • users should branch off of the default branch release/YYYY-MM-releaseNumber but this will change every month
  • if the feature you're are working on takes more than a month to complete, you'll need to rebase
    • if your target branch gets deleted (once its merged into main), does this also automatically close your PR?
  • if for some reason there is no release during a particular month, then all open PRs will need to have their target branch updated

I'm not trying to drag this discussion out but I think it's worth making this process as simple and as intuitive as possible for the sake of all devs (existing and new alike).

docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/index.mdx Outdated Show resolved Hide resolved
@pavithraes
Copy link
Member

pavithraes commented Dec 1, 2022

@iameskild Thank you for raising these great points! I'm on board with your original proposal involving the develop branch. :)

Bokeh's strategy does indeed add a couple of extra hoops for new contributors, and to combat that we've tried to make the process clear in our contributing guide. However, Bokeh also does significantly fewer releases (definitely not one per month!) which makes this much more manageable.

@trallard trallard added needs: changes 🧱 Review completed - some changes are needed before merging status: stale 🥖 Not up to date with the default branch - needs update and removed needs: review 👀 labels Dec 5, 2022
@iameskild iameskild added status: in review 👀 This PR is currently being reviewed by the team and removed status: stale 🥖 Not up to date with the default branch - needs update labels Dec 8, 2022
@iameskild
Copy link
Member Author

Hey @pavithraes and @trallard, I have updated these docs based on the discussion we had last week around switching from Bokeh-style gitflow to Gitlab-style gitflow. This is ready for a final review. Once this is merged, I will make the requisite changes to the nebari repo (i.e. set default branch to develop).

@trallard trallard added type: enhancement 💅🏼 New feature or request type: release 🏷 Releasing Nebari into the wild and removed type: release 🏷 Releasing Nebari into the wild labels Dec 9, 2022
Copy link
Member

@trallard trallard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some comments and changes that need to be addressed before merging this @iameskild

It seems your branch is now out of sync with main - so you will need to bring these in sync and move the release guide to the corresponding maintainer's section.

Edit: it does not seem to be out of sync but the file still needs moving and the sidebar needs update

@@ -0,0 +1,68 @@
---
id: release-process-branching-strategy
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since I cannot leave comments on files names - this needs to be under docs/community/maintainers

docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/docs/community/release-process.md Outdated Show resolved Hide resolved
docs/sidebars.js Outdated Show resolved Hide resolved
Copy link
Member

@pavithraes pavithraes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for working on this, @iameskild!

My only major suggestion -- I think we can move this page to the "Community/Maintainers" section, which might be a better fit. :)

The content looks complete though, so I'll approve and you can self-merge after!

iameskild and others added 6 commits December 9, 2022 08:41
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Tania Allard <taniar.allard@gmail.com>
Co-authored-by: Pavithra Eswaramoorthy <pavithraes@outlook.com>
@iameskild
Copy link
Member Author

@trallard @pavithraes thanks for the feedback! I think this is finally ready :)

@iameskild iameskild requested a review from trallard December 9, 2022 17:25
Copy link
Member

@trallard trallard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @iameskild this looks great. Will go ahead and merge.

@trallard trallard merged commit 2047ed0 into main Dec 9, 2022
@trallard trallard deleted the docs-releases branch December 9, 2022 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: developer experience 👩🏻‍💻 needs: changes 🧱 Review completed - some changes are needed before merging status: in review 👀 This PR is currently being reviewed by the team type: enhancement 💅🏼 New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants