actions/gradle
1
0
Fork 0
mirror of https://github.com/gradle/actions.git synced 2026-09-10 19:28:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify version status reporting: drop the output and move the check back to post-job

Browse Source
This commit is contained in:
Vlad Chesnokov
2026-08-26 12:59:43 +02:00
parent dfc644bc4a
commit 78c57b83ad
14 changed files with 113 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy
+3 -88
View File
@@ -6,7 +6,6 @@ import static org.junit.Assume.assumeTrue
class TestBuildResultRecorder extends BaseInitScriptTest {
def initScript = 'gradle-actions.build-result-capture.init.gradle'
String latestGradleMajor
def "produces build results file for build with #testGradleVersion"() {
assumeTrue testGradleVersion.compatibleWithCurrentJvm
@@ -270,63 +269,6 @@ task expectFailure {
testGradleVersion << SETTINGS_PLUGIN_VERSIONS
}
def "captures version status '#expectedStatus' when the latest released major is #latestMajor"() {
assumeTrue GRADLE_8_X.compatibleWithCurrentJvm
when:
latestGradleMajor = latestMajor
run(GRADLE_8_X.gradleVersion)
then:
assertVersionStatus(expectedStatus)
where:
latestMajor | expectedStatus
'7' | 'active'
'8' | 'active'
'9' | 'maintenance'
'10' | 'eol'
'13' | 'eol'
}
def "captures version status for #testGradleVersion"() {
assumeTrue testGradleVersion.compatibleWithCurrentJvm
when:
latestGradleMajor = '9'
run(testGradleVersion.gradleVersion)
then:
assertVersionStatus(expectedStatus)
where:
testGradleVersion | expectedStatus
GRADLE_6_X | 'eol'
GRADLE_7_X | 'eol'
GRADLE_8_X | 'maintenance'
}
def "captures no version status when the action did not supply the latest released major"() {
assumeTrue GRADLE_8_X.compatibleWithCurrentJvm
when:
run(GRADLE_8_X.gradleVersion)
then:
assertVersionStatus(null)
}
def "captures no version status when the latest released major is not a number"() {
assumeTrue GRADLE_8_X.compatibleWithCurrentJvm
when:
latestGradleMajor = 'not-a-number'
run(GRADLE_8_X.gradleVersion)
then:
assertVersionStatus(null)
}
def run(def args = ['help'], def gradleVersion) {
return run(args, initScript, gradleVersion, jvmArgs, envVars)
}
@@ -336,26 +278,17 @@ task expectFailure {
}
def getJvmArgs() {
def jvmArgs = [
[
"-DRUNNER_TEMP=${testProjectDir.absolutePath}".toString(),
"-DGITHUB_ACTION=github-step-id".toString()
]
if (latestGradleMajor != null) {
jvmArgs << "-DGRADLE_ACTIONS_LATEST_GRADLE_MAJOR=${latestGradleMajor}".toString()
}
jvmArgs
}
def getEnvVars() {
def envVars = [
[
RUNNER_TEMP: testProjectDir.absolutePath,
GITHUB_ACTION: 'github-step-id',
GITHUB_OUTPUT: githubOutputFile.absolutePath
GITHUB_ACTION: 'github-step-id'
]
if (latestGradleMajor != null) {
envVars.GRADLE_ACTIONS_LATEST_GRADLE_MAJOR = latestGradleMajor
}
envVars
}
void assertResults(String task, TestGradleVersion testGradleVersion, boolean hasFailure, boolean configCacheHit = false) {
@@ -375,24 +308,6 @@ task expectFailure {
assert scanResults['buildScanFailed'] == scanUploadFailed
}
void assertVersionStatus(String expectedStatus) {
def results = new JsonSlurper().parse(buildResultFile)
assert results['versionStatus'] == expectedStatus
if (expectedStatus == null) {
assert !githubOutput.contains('gradle-version-status')
} else {
assert githubOutput.contains("gradle-version-status=${expectedStatus}")
}
}
private File getGithubOutputFile() {
new File(testProjectDir, 'github-output')
}
private String getGithubOutput() {
githubOutputFile.exists() ? githubOutputFile.text : ''
}
private File getBuildResultFile() {
def buildResultsDir = new File(testProjectDir, '.gradle-actions/build-results')
assert buildResultsDir.directory