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.

Sign up for GitHub

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

Jump to bottom

Add instructions to sync release-next with main at code freeze #37209

Merged
merged 3 commits into from Apr 30, 2024
Merged

Add instructions to sync release-next with main at code freeze #37209

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d9e72d
Update info for the open-release-testing job
thomashampson Apr 24, 2024
91b3ce0
Add instruction to update release-next at code freeze.
thomashampson Apr 24, 2024
467cbee
Fix grammatical error in release checklist
thomashampson Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 13 additions & 8 deletions dev-docs/source/ReleaseChecklist.rst
View file
Open in desktop
Expand Up @@ -386,16 +386,21 @@ Code Freeze
<https://builds.mantidproject.org/view/Nightly%20Pipelines/job/main_nightly_deployment_prototype/>`__
has passed for all build environments. If it fails, decide if a fix is needed before moving on to
the next steps.
* Click ``Build Now`` on `open-release-testing
<https://builds.mantidproject.org/view/All/job/open-release-testing/>`__,
which will perform the following actions:
* Ask a mantid gatekeeper or administrator to update the ``release-next`` branch so that it's up to
date with the ``main`` branch, pushing the changes directly to GitHub:

.. code-block:: bash

* Create or update the ``release-next`` branch.
* Enable the job to periodically merge ``release-next`` into ``main``.
* Set the value of the Jenkins global property ``BRANCH_TO_PUBLISH`` to ``release-next``.
This will turn off publishing for the ``main`` branch pipeline and switch it on for the
``release-next`` pipeline.
git checkout release-next
git fetch origin main
git reset --hard origin/main
git push origin release-next --force

* Verify that the latest commit on ``release-next`` is correct before moving to the next step.
* Click ``Build Now`` on `open-release-testing
<https://builds.mantidproject.org/view/All/job/open-release-testing/>`__. This will
set the value of the Jenkins global property ``BRANCH_TO_PUBLISH`` to ``release-next``,
which will re-enable package publishing for the ``release-next`` nightly pipeline.
* Check the state of all open pull requests for this milestone and decide which
should be kept for the release, liaise with the Release Manager on this. Move any
pull requests not targeted for this release out of the milestone, and then change
Expand Down