diff init70-github.gradle @ 346:3504897af0f5

use github vars
author Marc Davis <marc.davis@mcoecn.org>
date Tue, 25 Jul 2023 14:31:34 -0400
parents b892973af800
children 1d55012b6af3
line wrap: on
line diff
--- a/init70-github.gradle	Wed Jun 14 14:42:03 2023 -0400
+++ b/init70-github.gradle	Tue Jul 25 14:31:34 2023 -0400
@@ -702,7 +702,7 @@
 }
 
 void setBranchInfo() {
-    gradle.ext.branch = new BranchInfo(System.getenv('bamboo_planRepository_branch'))
+    gradle.ext.branch = new BranchInfo(System.getenv('head_ref'))
     gradle.ext.branchName = gradle.branch.name
     gradle.ext.branchStream = gradle.branch.stream
     gradle.ext.branchHash = gradle.branch.hash
@@ -718,7 +718,7 @@
     def version
 
     String toString() {
-        "{name:$name, stream:$stream, buildNumber:$buildNumber, changeSet:$changeset, version:$version"
+        "{name:$name, stream:$stream, buildNumber:$buildNumber, changeSet:$changeset, version:$version}"
     }
 
     BranchInfo(name) {
@@ -728,8 +728,8 @@
         }
         this.name = this.name.replace('@', '-')
         determineStream()
-        buildNumber = System.getenv('bamboo_buildNumber') ?: ""
-        changeset = System.getenv('bamboo_planRepository_revision') ?: ""
+        buildNumber = System.getenv('run_number') ?: ""
+        changeset = System.getenv('sha') ?: ""
     }
 
     String getDefaultDependencyStatus() {
@@ -782,7 +782,7 @@
     private Version findSnapshotVersion() {
         println "findSnapshotVersion()"
         try {
-            def repositoryUrl = System.getenv('bamboo_planRepository_repositoryUrl')
+            def repositoryUrl = System.getenv('repositoryUrl')
             if (repositoryUrl) {
                 println "git pull $repositoryUrl".execute().text
             }