Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Experiments can be run successfully when configuration caching is enabled #365

Merged
merged 3 commits into from
Mar 20, 2023
Merged

Experiments can be run successfully when configuration caching is enabled #365

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d8b1b9
Replace usages of System.getProperty with gradle.startParameter.syste…
erichaagdev Mar 17, 2023
f747762
Defer reading runNum until it's required
erichaagdev Mar 17, 2023
fddc75f
Add clarifying comments
etiennestuder Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions components/scripts/gradle/gradle-init-scripts/configure-gradle-enterprise.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ initscript {

def getInputParam = { String name ->
def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
return System.getProperty(name) ?: System.getenv(envVarName)
return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
etiennestuder marked this conversation as resolved.
Show resolved Hide resolved
}

def pluginRepositoryUrl = getInputParam('com.gradle.enterprise.build-validation.gradle.plugin-repository.url')
Expand Down Expand Up @@ -61,7 +61,7 @@ if (!isTopLevelBuild) {

def getInputParam = { String name ->
def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
return System.getProperty(name) ?: System.getenv(envVarName)
return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
etiennestuder marked this conversation as resolved.
Show resolved Hide resolved
}

def geUrl = getInputParam('com.gradle.enterprise.build-validation.gradle-enterprise.url')
Expand All @@ -72,7 +72,6 @@ def ccudPluginVersion = getInputParam('com.gradle.enterprise.build-validation.cc
def expDir = getInputParam('com.gradle.enterprise.build-validation.expDir')
def expId = getInputParam('com.gradle.enterprise.build-validation.expId')
def runId = getInputParam('com.gradle.enterprise.build-validation.runId')
def runNum = getInputParam('com.gradle.enterprise.build-validation.runNum')
etiennestuder marked this conversation as resolved.
Show resolved Hide resolved
def scriptsVersion = getInputParam('com.gradle.enterprise.build-validation.scriptsVersion')

def atLeastGradle4 = GradleVersion.current() >= GradleVersion.version('4.0')
Expand All @@ -87,6 +86,11 @@ if (ccudPluginVersion && isNotAtLeast(ccudPluginVersion, '1.7')) {
def registerBuildScanActions = { def buildScan ->
def scanFile = new File(expDir, 'build-scans.csv')
buildScan.buildScanPublished { publishedBuildScan ->
def getInputParamCompatibleWithCC = { String name ->
etiennestuder marked this conversation as resolved.
Show resolved Hide resolved
etiennestuder marked this conversation as resolved.
Show resolved Hide resolved
def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
return System.getProperty(name) ?: System.getenv(envVarName)
}
def runNum = getInputParamCompatibleWithCC('com.gradle.enterprise.build-validation.runNum')
def buildScanUri = publishedBuildScan.buildScanUri
def buildScanId = publishedBuildScan.buildScanId
def port = (buildScanUri.port != -1) ? ':' + buildScanUri.port : ''
Expand Down
2 changes: 1 addition & 1 deletion components/scripts/gradle/gradle-init-scripts/configure-local-build-caching.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if (!isTopLevelBuild) {

def getInputParam = { String name ->
def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
return System.getProperty(name) ?: System.getenv(envVarName)
return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
}

def expDir = getInputParam('com.gradle.enterprise.build-validation.expDir')
Expand Down
2 changes: 1 addition & 1 deletion components/scripts/gradle/gradle-init-scripts/configure-remote-build-caching.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if (!isTopLevelBuild) {

def getInputParam = { String name ->
def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
return System.getProperty(name) ?: System.getenv(envVarName)
return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
}

def remoteBuildCacheUrl = getInputParam('com.gradle.enterprise.build-validation.remoteBuildCacheUrl')
Expand Down