Fix branch publishing

mablhq · Aug 3, 2023 · dbb4469 · dbb4469
1 parent 2feb59b
commit dbb4469
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
@@ -43,4 +43,4 @@ jobs:
         run: ./gradlew test --console plain
 
       - name: Publish artifacts
-        run: ./gradlew publish
+        run: ./gradlew publish -x test -Pbranch="$GITHUB_HEAD_REF"
diff --git a/build.gradle b/build.gradle
@@ -14,19 +14,13 @@ ext {
     baseVersion = '1.0.0'
 
     getBranch = {
-        return "${System.getenv('GITHUB_HEAD_REF') ?: ''}"
+        return project.findProperty('branch') ?: ''
     }
 
-    getUsername = {
-        return System.properties['user.name']
-    }
-
-    determineProjectVersion = { baseVersion, branch, username ->
+    determineProjectVersion = { baseVersion, branch ->
         projectVersion = baseVersion
         if (!branch.equals("main")) {
-            if (branch.isEmpty()) {
-                projectVersion = "${projectVersion}-${username}"
-            } else {
+            if (!branch.isEmpty()) {
                 projectVersion = "${projectVersion}-${branch}"
             }
             projectVersion = "${projectVersion}-SNAPSHOT"
@@ -37,7 +31,7 @@ ext {
 
 group = 'com.mabl'
 archivesBaseName = 'pac-interpreter'
-version = determineProjectVersion(baseVersion, getBranch(), getUsername())
+version = determineProjectVersion(baseVersion, getBranch())
 
 java {
     toolchain {