changeset 337:70a96f123a03

testing
author marc_davis <davis@ssdt-ohio.org>
date Tue, 30 May 2023 13:02:19 -0400
parents 6258c89efe9e
children 0befe249fc6f
files init70-github.gradle
diffstat 1 files changed, 10 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/init70-github.gradle	Tue May 30 12:54:59 2023 -0400
+++ b/init70-github.gradle	Tue May 30 13:02:19 2023 -0400
@@ -35,21 +35,11 @@
     hostname = 'unknown'
 }
 
-gradle.ext.bambooBuild = true
-
-//gradle.ext.bambooBuild = System.getenv().any {
-//    it.key.toLowerCase().contains('bamboo')
-//} || hostname?.startsWith('ssdt-ba')
+gradle.ext.bambooBuild = System.getenv().any {
+    it.key.toLowerCase().contains('CI')
+}
 
-//if (!rootProject.hasProperty("bambooLocalBuild")) {
-//    gradle.ext.bambooLocalBuild = false
-//} else {
-//    gradle.ext.bambooLocalBuild = rootProject.bambooLocalBuild.toBoolean()
-//}
-//
-//if (gradle.bambooLocalBuild) {
-//    println "Bamboo local build active"
-//}
+gradle.ext.bambooLocalBuild = false
 
 gradle.ext.bambooPlan = (System.getenv('BAMBOO_PLAN') ?: 'UNKNOWN-UNKNOWN-JOB1').split('-')[0..1].join('-')
 logger.info "Bamboo plan: ${gradle.bambooPlan}"
@@ -138,9 +128,12 @@
 
 println "Indy available: ${rootProject.indyCapable()} enabled: ${rootProject.useIndy()}"
 
-file('build-number.txt').text = "build.number=${gradle.branch.buildNumber ?: -1 }\n"
-logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)"
-apply from: resources.text.fromInsecureUri("${gradle.ssdtDevelkitLocation}/artifactory70.gradle")
+if (gradle.bambooBuild) {
+
+    file('build-number.txt').text = "build.number=${gradle.branch.buildNumber ?: -1 }\n"
+    logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)"
+    apply from: resources.text.fromInsecureUri("${gradle.ssdtDevelkitLocation}/artifactory70.gradle")
+}
 
 if (!rootProject.hasProperty('disableMetrics')) {
     apply from: resources.text.fromInsecureUri("${gradle.ssdtDevelkitLocation}/metrics70.gradle")