working on build

BestSolution-at · Jul 20, 2020 · 3ced1ed · 3ced1ed
1 parent 67b40f2
commit 3ced1ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -280,7 +280,7 @@ task notifyJenkins() {
         def githubToken = System.getenv('GH_ACCESS_TOKEN')
 
         def request = new Request.Builder()
-        .url("https://ci.eclipse.org/efxclipse/job/efxclipse_drift_build/buildWithParameters?token=$jenkinsToken&GITHUB_ACCESS_TOKEN=$githubToken&GITHUB_RUN_ID=$runId&GIT_SHA=${getGitHash()}")
+        .url("https://ci.eclipse.org/efxclipse/job/efxclipse_drift_build/buildWithParameters?token=$jenkinsToken&GITHUB_ACCESS_TOKEN=$githubToken&GITHUB_RUN_ID=$runId&GIT_SHA=${Versioning.gitSHA}")
         .build()
         def response = client.newCall(request).execute()
         println "notify jenkins: ${response.code}"

diff --git a/versioning.gradle b/versioning.gradle
@@ -83,13 +83,15 @@ ext {
         version: tmpVersion,
         qualifier: tmpQualifier,
         fullVersion: tmpFullVersion,
-        bundleVersion: tmpBundleVersion
+        bundleVersion: tmpBundleVersion,
+        gitSHA: getGitHash()
     ]
 }
 
 
 task showVersioning {
     println "Versioning: " //${new groovy.json.JsonBuilder(Versioning).toPrettyString()}"
+    println "\tgitSJA: $Versioning.gitSHA"
     println "\treleaseMode: $Versioning.releaseMode"
     println "\treleaseTag: $Versioning.releaseTag"
     println "\tversion: $Versioning.version"