Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Not only the 'master' prefix but also the 'main' prefix is now stripped when deriving the version identifier #160

Merged
merged 1 commit into from
Sep 10, 2024
+1 −1
Merged

Not only the 'master' prefix but also the 'main' prefix is now stripped when deriving the version identifier #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion git-based-versioning/src/main/groovy/de/itemis/mps/gradle/GitBasedVersioning.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading