Use ARTIFACTORY_URL variable

ElyxorCorp · Jan 24, 2024 · 976d8be · 976d8be
1 parent 0dad4a8
commit 976d8be
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/java-build-and-publish.yml b/.github/workflows/java-build-and-publish.yml
@@ -34,3 +34,4 @@ jobs:
       env:
         USERNAME: ${{ github.actor }}
         TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
+        URL: ${{ vars.ARTIFACTORY_URL }}
diff --git a/build.gradle b/build.gradle
@@ -104,10 +104,12 @@ ext {
     if (gitBranch == 'master') {
         println 'Building master branch'
         project.version = getMasterVersion()
+        artifactoryRepo = 'libs-release-local'
     } else {
         branchVersionIdentifier = gitBranch.replaceAll("[\\W]", "_")
         println 'Building branch: ' + branchVersionIdentifier
         project.version = getBranchVersion(branchVersionIdentifier)
+        artifactoryRepo = 'libs-snapshot-local'
     }
 
     println 'Version: ' + project.version
@@ -156,7 +158,7 @@ publishing {
     }
     repositories {
         maven { 
-            url = 'https://artifactory.elyxor.com/artifactory/libs-snapshot-local' 
+            url = System.getenv('URL') + '/' + artifactoryRepo
             credentials(HttpHeaderCredentials) {
                 name = "X-JFrog-Art-API"
                 value = System.getenv('TOKEN')

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 artifactMajorVersion = 0
 artifactMinorVersion = 1
-artifactPatchVersion = 3
+artifactPatchVersion = 11
 
 applicationGroupId = com.elyxor.cachethq
 applicationTitle = Cachet HQ okhttp-gson API Client (java)
@@ -10,4 +10,4 @@ licenseName = Apache 2.0
 specVendor = Elyxor, Inc.
 url = https://github.com/ElyxorInc/cachethq-swagger
 licenseUrl = https://github.com/ElyxorInc/cachethq-swagger/blob/master/LICENSE
-scmUrl = scm:git:https://github.com/ElyxorInc/cachethq-swagger.git
+scmUrl = scm:git:https://github.com/ElyxorInc/cachethq-swagger.git