# HG changeset patch # User Marc Davis # Date 1690374615 14400 # Node ID 45fc06cbb6b2c1fb3e6d438c3be7a16da69ed762 # Parent aa5e8be335d67da5706e94af702768644b452752 use github system properties diff -r aa5e8be335d6 -r 45fc06cbb6b2 init40-github.gradle --- a/init40-github.gradle Tue Jul 25 15:58:59 2023 -0400 +++ b/init40-github.gradle Wed Jul 26 08:30:15 2023 -0400 @@ -706,7 +706,7 @@ } void setBranchInfo() { - def branchInfo = new BranchInfo(System.getenv('bamboo_planRepository_branch')) + def branchInfo = new BranchInfo(System.getenv('ssdt_head_ref')) gradle.ext.branch = branchInfo gradle.ext.branchName = gradle.branch.name gradle.ext.branchStream = gradle.branch.stream @@ -715,7 +715,6 @@ } -@ToString(includes=['name','shortName','buildVersion','imageId','deployName'],includeNames= true) class BranchInfo { def name def stream = "none" @@ -723,6 +722,10 @@ def changeset = "" def version + String toString() { + "{name:$name, stream:$stream, buildNumber:$buildNumber, changeSet:$changeset, version:$version}" + } + BranchInfo(name) { this.name = name if (!name) { @@ -730,8 +733,8 @@ } this.name = this.name.replace('@', '-') determineStream() - buildNumber = System.getenv('bamboo_buildNumber') ?: "" - changeset = System.getenv('bamboo_planRepository_revision') ?: "" + buildNumber = System.getenv('ssdt_run_number') ?: "" + changeset = System.getenv('ssdt_sha') ?: "" } String getDefaultDependencyStatus() { @@ -784,7 +787,7 @@ private Version findSnapshotVersion() { println "findSnapshotVersion()" try { - def repositoryUrl = System.getenv('bamboo_planRepository_repositoryUrl') + def repositoryUrl = System.getenv('ssdt_repositoryUrl') if (repositoryUrl) { println "git pull $repositoryUrl".execute().text }