Merge pull request #160 from mbeddr/bugfix/main_vs_master_branch

alexanderpann · web-flow · commit eee9d0fd15e5 · 2024-09-10T09:44:25.000+02:00
diff --git a/git-based-versioning/src/main/groovy/de/itemis/mps/gradle/GitBasedVersioning.groovy b/git-based-versioning/src/main/groovy/de/itemis/mps/gradle/GitBasedVersioning.groovy
@@ -86,7 +86,7 @@ class GitBasedVersioning {
     static String getVersion(String branch, String major, String minor, String bugfix = "", int count) {
         def hash = getGitShortCommitHash()
         def baseVersion = bugfix.isEmpty() ? "$major.$minor.$count.$hash" : "$major.$minor.$bugfix.$count.$hash"
-        if (branch == 'master' || branch == 'HEAD' /*this happens in detached head situations*/) {
+        if (branch == 'master' || branch == 'main' || branch == 'HEAD' /*this happens in detached head situations*/) {
             return baseVersion
         }
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class GitBasedVersioning {`
`86`	`86`	`static String getVersion(String branch, String major, String minor, String bugfix = "", int count) {`
`87`	`87`	`def hash = getGitShortCommitHash()`
`88`	`88`	`def baseVersion = bugfix.isEmpty() ? "$major.$minor.$count.$hash" : "$major.$minor.$bugfix.$count.$hash"`
`89`		`- if (branch == 'master' \|\| branch == 'HEAD' /this happens in detached head situations/) {`
	`89`	`+ if (branch == 'master' \|\| branch == 'main' \|\| branch == 'HEAD' /this happens in detached head situations/) {`
`90`	`90`	`return baseVersion`
`91`	`91`	`}`
`92`	`92`