Skip to content

Commit

Permalink
chore(build): take includeCloudProviders out of gradle.properties (#4529
Browse files Browse the repository at this point in the history
)

Moves the default of all into settings.gradle if otherwise unspecified, but this allows a local development
environment to override the value in ~/.gradle/gradle.properties
  • Loading branch information
cfieber committed Apr 19, 2020
1 parent e9a98c1 commit 610762a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
fiatVersion=1.18.3
includeCloudProviders=all
korkVersion=7.37.0
org.gradle.parallel=true
spinnakerGradleVersion=8.0.0-rc.3
4 changes: 3 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ cloudProviderProjects.put('gcp', cloudProviderProjects['appengine'] + cloudProvi
cloudProviderProjects.put('titus', cloudProviderProjects['aws'] + ':clouddriver-titus' + ':clouddriver-docker')
cloudProviderProjects.put('all', cloudProviderProjects.collectMany {_, proj -> proj}) // Include all cloud providers.

String icp = settings.ext.has('includeCloudProviders') ? settings.ext.get('includeCloudProviders') : 'all'

// Set as an ext variable so that build scripts can access it
gradle.ext.includedCloudProviderProjects = includeCloudProviders.split(',')
gradle.ext.includedCloudProviderProjects = icp.split(',')
.collectMany { cloudProviderProjects[it.toLowerCase()] }
.toSet()
.toList()
Expand Down

0 comments on commit 610762a

Please sign in to comment.