Merge pull request #877 from pablomedeiross/feat/branch-version-by-gi…

…tlab feature: including new logic to handle versions from gitlab tags and …
freefair · Sep 3, 2023 · 8516eed · 8516eed
2 parents b1a2281 + b76a556
commit 8516eed
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/git-plugin/src/main/java/io/freefair/gradle/plugins/git/GitVersionPlugin.java b/git-plugin/src/main/java/io/freefair/gradle/plugins/git/GitVersionPlugin.java
@@ -121,6 +121,21 @@ else if (GitUtil.isCircleCi(providerFactory)) {
                 logger.lifecycle("Using CIRCLE_BRANCH '{}' as version: {}", circleBranch, version);
                 return version;
             }
+
+        } else if (GitUtil.isGitLab(providerFactory)) {
+            Provider<String> gitLabTag = providerFactory.environmentVariable("CI_COMMIT_TAG");
+            if (gitLabTag.isPresent()) {
+                String version = resolveTagVersion(gitLabTag.get().trim());
+                logger.lifecycle("Using CI_COMMIT_TAG '{}' as version: {}", gitLabTag, version);
+                return version;
+            }
+
+            Provider<String> gitLabBranch = providerFactory.environmentVariable("CI_COMMIT_BRANCH");
+            if (gitLabBranch.isPresent()) {
+                String version = resolveBranchVersion(gitLabBranch.get());
+                logger.lifecycle("Using CI_COMMIT_BRANCH '{}' as version: {}", gitLabBranch, version);
+                return version;
+            }
         }
 
         try {

diff --git a/plugin-utils/src/main/java/io/freefair/gradle/util/GitUtil.java b/plugin-utils/src/main/java/io/freefair/gradle/util/GitUtil.java
@@ -29,6 +29,10 @@ public boolean isJenkins(ProviderFactory providerFactory) {
         return providerFactory.environmentVariable("JENKINS_HOME").isPresent();
     }
 
+    public boolean isGitLab(ProviderFactory providerFactory) {
+        return providerFactory.environmentVariable("GITLAB_CI").isPresent();
+    }
+
     public String getSha(Project project) {
         if (isGithubActions(project.getProviders())) {
             return project.getProviders().environmentVariable("GITHUB_SHA").get();