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 instructions to sync release-next with main at code freeze #37209

Merged
merged 3 commits into from Apr 30, 2024

Conversation

thomashampson
Copy link
Contributor

Description of work

Since the Docker container for deployment-tools disappeared, the Jenkins job for pointing release-next to the tip of main wasn't working. After discussion, we decided the best plan was to simply add instructions to the release checklist for performing the task manually. Otherwise it is too easy for any developer to click the "run job" button and spoil the release-next branch part way through the release period.

Fixes #36918

To test:

Check that the instructions are clear and the logic is correct.

This does not require release notes because it's an update to dev docs


Reviewer

Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.

Code Review

  • Is the code of an acceptable quality?
  • Does the code conform to the coding standards?
  • Are the unit tests small and test the class in isolation?
  • If there is GUI work does it follow the GUI standards?
  • If there are changes in the release notes then do they describe the changes appropriately?
  • Do the release notes conform to the release notes guide?

Functional Tests

  • Do changes function as described? Add comments below that describe the tests performed?
  • Do the changes handle unexpected situations, e.g. bad input?
  • Has the relevant (user and developer) documentation been added/updated?

Does everything look good? Mark the review as Approve. A member of @mantidproject/gatekeepers will take care of it.

Gatekeeper

If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.

@thomashampson thomashampson added Extra Attention Testers and Gate keepers should pay extra attention as this affects core aspects. ISIS Team: Core Issue and pull requests managed by the Core subteam at ISIS DevOps Issues and pull requests related to DevOps labels Apr 24, 2024
@thomashampson thomashampson added this to the Release 6.10 milestone Apr 24, 2024
@thomashampson thomashampson marked this pull request as ready for review April 24, 2024 15:21
@robertapplin robertapplin self-assigned this Apr 25, 2024
Copy link
Contributor

@robertapplin robertapplin left a comment

Choose a reason for hiding this comment

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

Looks good, easy to follow!

@SilkeSchomann SilkeSchomann merged commit 5b199b3 into main Apr 30, 2024
8 of 9 checks passed
@SilkeSchomann SilkeSchomann deleted the 36918_sync_release_next_with_main branch April 30, 2024 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DevOps Issues and pull requests related to DevOps Extra Attention Testers and Gate keepers should pay extra attention as this affects core aspects. ISIS Team: Core Issue and pull requests managed by the Core subteam at ISIS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sync release-next at the start of release period
3 participants