changeset 291:7dc9624e59f7

Always apply artifactory40 ssdt config. Skip functionality if the build is non bamboo
author Marc Davis <marc.davis@mcoecn.org>
date Mon, 22 Aug 2022 14:32:18 -0400
parents 699e05046398
children 2307b12a55e6
files init40.gradle
diffstat 1 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/init40.gradle	Thu Jun 23 13:21:12 2022 -0400
+++ b/init40.gradle	Mon Aug 22 14:32:18 2022 -0400
@@ -138,13 +138,12 @@
 println "Indy available: ${rootProject.indyCapable()} enabled: ${rootProject.useIndy()}"
 
 if (gradle.bambooBuild) {
-  
     file('build-number.txt').text = "build.number=${gradle.branch.buildNumber ?: -1 }\n"
-    gradle.ext.ssdtGradlekitLocation = gradle.ext.has('ssdtGradlekitLocation') ? gradle.ssdtGradlekitLocation : 'http://hg.ssdt-ohio.org/ssdt/gradlekit/raw-file/tip'
-    logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)"
-    println "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)"
-    apply from: "${gradle.ssdtGradlekitLocation}/artifactory40.gradle"
 }
+gradle.ext.ssdtGradlekitLocation = gradle.ext.has('ssdtGradlekitLocation') ? gradle.ssdtGradlekitLocation : 'http://hg.ssdt-ohio.org/ssdt/gradlekit/raw-file/tip'
+logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)"
+println "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)"
+apply from: "${gradle.ssdtGradlekitLocation}/artifactory40.gradle"
 
 if (!rootProject.hasProperty('disableMetrics')) {
     println "applying SSDT metrics40.gradle"
@@ -259,6 +258,10 @@
         }
     }
 
+    if (!gradle.bambooBuild) {
+        artifactoryPublish.skip = true
+    }
+
 }
 
 subprojects {