You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Language/content agnostic method of automatically determining the [semantic version](https://semver.org/) for a product based on merge history with MINIMAL discipline dependencies.
8
+
Language/content agnostic method of automatically determining the [semantic version](https://semver.org/) for a product based on _branch_merge history with MINIMAL discipline dependencies.
9
9
10
-
This is accomplished by counting the merges for 'enhancement/.\*', 'feature/.\*', 'fix/.\*', 'bugfix/.\*', 'hotfix/.\*', 'ops/.\*' branches into either the 'main' or 'master' branch. Folks familiar with Scrum/SAFe or GitFlow/.*Flow branching strategies will recognize this scheme.
10
+
This is accomplished by counting the merges of branches matching the [naming scheme](#branch-naming-scheme)into either the [main|master] branch. Folks familiar with Scrum/SAFe or GitFlow/fooFlow strategies will recognize this scheme.
11
11
12
12
**Yes**, this can be implemented in repos that previously used different version increment methods.
13
13
@@ -33,7 +33,12 @@ git push --tags</pre></dd>
33
33
npm version $NEW_VERSION</pre></dd>
34
34
<dd>4. Tag the repo with the new version at some point in the workflow.
35
35
<dt>Team Setup</dt>
36
-
<dd>5. Ensure the iteration team adheres to the branch naming scheme defined below.</dd>
36
+
<dd>5. Ensure the iteration team adheres to the branch naming scheme defined below. Here's an example workflow.</dd>
37
+
<dd><pre>
38
+
git checkout -b fix/not-a-feature
39
+
git commit --allow-empty -m "This was a bug and not a feature after all..."
40
+
git push --set-upstream origin fix/not-a-feature
41
+
# THEN: Click the link to create a PR & merge it</pre></dd>
37
42
</dl>
38
43
39
44
### Outputs
@@ -89,9 +94,14 @@ _minor:_
89
94
> Q: _How did you execute 103 merges?_<br>
90
95
A: You can use the bump scripts in the scripts directory of this<br>
91
96
repo, like: './scripts/bumpPatch.sh 42'<br>
97
+
(Does not work with branch protection enabled)
98
+
99
+
> NOTE: This repo uses its own action for versioning, so feel free to investigate that workflow for another example.
92
100
93
101
## Discipline Dependency
94
102
103
+
### Branch Naming Scheme
104
+
95
105
This action depends _only_ on the following _branch naming scheme_ being observed.
96
106
97
107
| Branch Name | Increment | Description |
@@ -189,4 +199,4 @@ PR's welcome...
189
199
- Specifying custom branch names to indicate MINOR and PATCH versions.
190
200
- Subdirectory specific versioning.
191
201
- Full GH Actions Workflow Example, including tagging and GH release.
192
-
- CAN'T DO: unshallow from last version tag to latest commit to... Seems a limitation of (git at first glance).
202
+
- CAN'T DO: unshallow from last version tag to latest commit to... Seems a limitation of (git at first glance).
0 commit comments