Skip to content

Commit 791a8c4

Browse files
Clarify release tagging instructions
Updated instructions for tagging a release, clarifying branch usage and environment setup.
1 parent 184bde0 commit 791a8c4

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

sbndcode_wiki/Tagging_a_release.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,10 @@ Instructions
4646
4747
- Additional modes are available for production releases (which utilize different branches) and for sbndutil (production script repo).
4848

49-
- Use `master` branch for bringing forth production releases when prompted by `git flow init -f`. Everything else is set to it's default so you can just hit enter through the rest of the prompts.
49+
- When prompted by `git flow init -f`, enter the branches as instructed by the script. These will vary depending on if you are cutting a production release or a develop/mainline release.
50+
The proper branches are indicated by a `--> Use SOMEBRANCH` output to the terminal.
5051

51-
- This will create new releases of `sbndcode` and `sbndutil`, with branches `release/vXX_YY_ZZ`.
52-
53-
- Merge any feature branches that are going into the release, fixing
54-
any merge conflicts.
52+
- This will create new releases of `sbndcode` and `sbndutil`, with branches `release/vXX_YY_ZZ`. You will need to cd into the directory the script just created and load up the mrb environment.
5553

5654
- Change any files that include the version number of the package
5755
being tagged and the version numbers of dependent products.
@@ -68,10 +66,13 @@ Instructions
6866
- `$MRB_SOURCE/sbndutil/ups/product_deps` (if using sbndutil mode)
6967

7068
- Do a full install and run the unit tests.
71-
69+
70+
If you haven't already...
7271
cd lardev-<your version>
7372
source localProducts_larsoft_<your version>_e26_prof/setup
7473
mrbsetenv
74+
75+
Then do...
7576
mrb t -j16
7677

7778
- If any unit tests fail, identify the offending code and email the

0 commit comments

Comments
 (0)