actions/gradle
1
0
Fork 0
mirror of https://github.com/gradle/actions.git synced 2025-12-08 17:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make it possible to run more init-script tests on M1 Mac

Browse Source 
Older TestKit on M1 Mac doesn't allow env vars to be passed, so we need to use
jvmArgs instead.
This commit is contained in:
daz
2024-04-08 09:46:48 -06:00
parent 2b3c9df6d2
commit 0ac212a9d2
6 changed files with 98 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/src/resources/init-scripts/gradle-actions.build-result-capture-service.plugin.groovy
View File

@@ -45,8 +45,8 @@ abstract class BuildResultsRecorder implements BuildService<BuildResultsRecorder
buildScanFailed: false
]
def runnerTempDir = System.getenv("RUNNER_TEMP")
def githubActionStep = System.getenv("GITHUB_ACTION")
def runnerTempDir = System.getProperty("RUNNER_TEMP") ?: System.getenv("RUNNER_TEMP")
def githubActionStep = System.getProperty("GITHUB_ACTION") ?: System.getenv("GITHUB_ACTION")
if (!runnerTempDir || !githubActionStep) {
return
}

4
sources/src/resources/init-scripts/gradle-actions.build-result-capture.init.gradle
View File

@@ -125,8 +125,8 @@ class BuildResults {
}
def writeToResultsFile(boolean overwrite) {
def runnerTempDir = System.getenv("RUNNER_TEMP")
def githubActionStep = System.getenv("GITHUB_ACTION")
def runnerTempDir = System.getProperty("RUNNER_TEMP") ?: System.getenv("RUNNER_TEMP")
def githubActionStep = System.getProperty("GITHUB_ACTION") ?: System.getenv("GITHUB_ACTION")
if (!runnerTempDir || !githubActionStep) {
return
}