| Joey Armstrong | 3980d70 | 2023-08-23 10:57:18 -0400 | [diff] [blame^] | 1 | Repository: pod-configs |
| 2 | ======================= |
| 3 | |
| 4 | - NO VERSION FILE |
| 5 | - Tag and branch repositories (order is important) |
| 6 | - Update .gitreview, set defaultbranch=voltha-2.12-beta for commits |
| 7 | - Update VERSION file to prevent future conflicts. |
| 8 | |
| 9 | |
| 10 | Release branching and tagging |
| 11 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 12 | |
| 13 | Releasing repository voltha-lib-go requires tag-then-release branching, |
| 14 | first create a versioned tag 2.12.0-beta then create branch voltha-2.12-beta |
| 15 | from the release tag. |
| 16 | |
| 17 | Repository tag names differ based on repository, golang repositories |
| 18 | use tags with the prefix vee v1.2.3, v2.45.0 |
| 19 | |
| 20 | .. code-block:: shell-session |
| 21 | :caption: First create a release tag |
| 22 | |
| 23 | # Determine repository tagname convention (with/with-out vee) |
| 24 | git clone "ssh://gerrit.opencord.org:29418/${repo_name}.git" |
| 25 | git tag --list-tags |
| 26 | |
| 27 | # --------------------------- |
| 28 | # Step 1 create a release tag |
| 29 | # --------------------------- |
| 30 | local branch_name='voltha-2.12-beta' |
| 31 | local tag_name='v2.12.0-beta' |
| 32 | |
| 33 | git tag -a "$tag_name" -m "${branch_name} release" |
| 34 | git push origin "$tag_name" |
| 35 | |
| 36 | .. code-block:: shell-session |
| 37 | :caption: Create a release branch attached to the release tag |
| 38 | |
| 39 | # ------------------------------------------------------------ |
| 40 | # Step 2 - create a release branch attached to the release tag |
| 41 | # ------------------------------------------------------------ |
| 42 | local branch_name='voltha-2.12-beta' |
| 43 | local tag_name='v2.12.0-beta' |
| 44 | local repo_name='voltha-lib-go' |
| 45 | |
| 46 | git clone "ssh://gerrit.opencord.org:29418/${repo_name}.git" |
| 47 | git fetch --all --tags |
| 48 | |
| 49 | git checkout -b "$branch_name" "tags/tag_name" |
| 50 | git push origin "$branch_name" "tags/$tag_name" |
| 51 | |
| 52 | See Also |
| 53 | -------- |
| 54 | https://docs.voltha.org/master/release_notes/release_process.html |
| 55 | |
| 56 | |
| 57 | .gitreview |
| 58 | ---------- |
| 59 | |
| 60 | .. code-block:: shell-session |
| 61 | :caption: Create a release branch attached to the release tag |
| 62 | |
| 63 | grep -v 'defaultbranch' .gitreview > .gitreview.tmp |
| 64 | echo "defaultbranch=voltha-2.12-beta" >> .gitreview.tmp |
| 65 | mv -f .gitreview.tmp .gitreview |
| 66 | |
| 67 | |
| 68 | VERSION File |
| 69 | ^^^^^^^^^^^^ |
| 70 | |
| 71 | Minor release version number must be incremented to prevent future conflicts |
| 72 | with the patch branch. |
| 73 | |
| 74 | - branch=main VERSION=1.2.3 |
| 75 | |
| 76 | - Update VERSION to contain 1.2.4 or 1.3.0 |
| 77 | - commit and merge |
| 78 | |
| 79 | - Update VERSION file/patch branch to contain 1.2.3.1 |
| 80 | - Update defaultbranch= in .gitreview |
| 81 | - commit and merge |
| 82 | |