Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Fix Jira Link

...

Make a release page by copying one such as https://confluence.renalregistry.nhs.uk/display/RR/1.1.11 and modifying the Jira component to return tickets from the new version. Blank the release date.


The steps are -


1) While in the branch folder Tag the branch with -

Code Block
rr_git.py --action tagbranch --branch-label Y.Y.Y --tag-label vY.Y.Y

Y.Y.Y here should be the version being released.

Note

Git, or at least the version of Git on my PC breaks if a tag and branch exist with the same names. This is why I have the tag labels prefixed with a 'v'.

2) Create a Pull Request for the branch in BitBucket and merge it into Master

3Create a Pull Request for the branch for each of the components in BitBucket and merge it into Master. Do not tick the option to delete the branch.

Note

TODO: rr_git should have a command to do this.


2) Checkout Master into a new directory with

Code Block
rr_git.py --destination C:/MyWork/UKRR/Master


Warning

Despite not supplying branch_label this seems to clone the sub-packages using the branch ID from the requirements.txt files.  Make sure to checkout master in each directory before doing the next actions.


It also seems not to work if the output directory already exists. In this situation a "pull" is also required.


(Amend path as required)

4) Remove references to the branch from the requirements.txt in the repos under the master folder.

...

Push afterwards.

Note that this requires requires 

Jira Legacy
serverUK Renal Registry JiraSystem JIRA
columnskey,summary,type,created,updated,due,assignee,reporter,priority,status,resolution
serverIdf5f38dbd35505f1e-4aee644e-38a93a35-ae26bc6c-bb00e3a680b42d63e77a590f
keyRR-1436
to be done before this will workcan be automatically.


3) Tag the branch with -


Code Block
rr_git.py --action tag --tag-label vY.Y.Y --destination C:/MyWork/UKRR/Master

Y.Y.Y here should be the version being released.

Note

Git, or at least the version of Git on my PC breaks if a tag and branch exist with the same names. This is why I have the tag labels prefixed with a 'v'.



5) A new build should have been made under

...