Merge pull request #160 from mbeddr/bugfix/main_vs_master_branch

mbeddr · Sep 10, 2024 · eee9d0f · eee9d0f
2 parents 896925d + e070f8a
commit eee9d0f
Showing 1 changed file with 1 addition and 1 deletion.
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
         }