diff --git a/src/dependency-graph.ts b/src/dependency-graph.ts index a65eb4c..0c25ac2 100644 --- a/src/dependency-graph.ts +++ b/src/dependency-graph.ts @@ -21,8 +21,11 @@ export function setup(option: DependencyGraphOption): void { core.info('Enabling dependency graph generation') const jobCorrelator = getJobCorrelator() core.exportVariable('GITHUB_DEPENDENCY_GRAPH_ENABLED', 'true') - core.exportVariable('GITHUB_JOB_CORRELATOR', jobCorrelator) - core.exportVariable('GITHUB_JOB_ID', github.context.runId) + core.exportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR', jobCorrelator) + core.exportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_ID', github.context.runId) + core.exportVariable('GITHUB_DEPENDENCY_GRAPH_REF', github.context.ref) + core.exportVariable('GITHUB_DEPENDENCY_GRAPH_SHA', github.context.sha) + core.exportVariable('GITHUB_DEPENDENCY_GRAPH_WORKSPACE', layout.workspaceDirectory()) core.exportVariable( 'DEPENDENCY_GRAPH_REPORT_DIR', path.resolve(layout.workspaceDirectory(), 'dependency-graph-reports') diff --git a/src/resources/init-scripts/gradle-build-action.github-dependency-graph-gradle-plugin-apply.groovy b/src/resources/init-scripts/gradle-build-action.github-dependency-graph-gradle-plugin-apply.groovy index 381bc44..7287d25 100644 --- a/src/resources/init-scripts/gradle-build-action.github-dependency-graph-gradle-plugin-apply.groovy +++ b/src/resources/init-scripts/gradle-build-action.github-dependency-graph-gradle-plugin-apply.groovy @@ -3,7 +3,7 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath "org.gradle:github-dependency-graph-gradle-plugin:0.2.0" + classpath "org.gradle:github-dependency-graph-gradle-plugin:0.4.0" } } apply plugin: org.gradle.github.GitHubDependencyGraphPlugin diff --git a/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle b/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle index e992919..e7fbf95 100644 --- a/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle +++ b/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle @@ -15,10 +15,10 @@ if (GradleVersion.current().baseVersion < GradleVersion.version("5.0")) { // This is only required for top-level builds def isTopLevelBuild = gradle.getParent() == null if (isTopLevelBuild) { - def reportFile = getUniqueReportFile(System.env.GITHUB_JOB_CORRELATOR) + def reportFile = getUniqueReportFile(System.env.GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR) if (reportFile == null) { - println "::warning::No dependency snapshot generated for step. Could not determine unique job correlator - specify GITHUB_JOB_CORRELATOR var for this step." + println "::warning::No dependency snapshot generated for step. Could not determine unique job correlator - specify GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR var for this step." return } @@ -49,7 +49,7 @@ File getUniqueReportFile(String jobCorrelator) { def candidateCorrelator = jobCorrelator + "-" + i def candidateFile = new File(reportDir, candidateCorrelator + ".json") if (!candidateFile.exists()) { - System.properties['GITHUB_JOB_CORRELATOR'] = candidateCorrelator + System.properties['GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR'] = candidateCorrelator return candidateFile } } diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy index 8f98dc2..5d76807 100644 --- a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy +++ b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy @@ -110,11 +110,11 @@ class TestDependencyGraph extends BaseInitScriptTest { def getEnvVars() { return [ GITHUB_DEPENDENCY_GRAPH_ENABLED: "true", - GITHUB_JOB_CORRELATOR: "CORRELATOR", - GITHUB_JOB_ID: "1", - GITHUB_REF: "main", - GITHUB_SHA: "123456", - GITHUB_WORKSPACE: testProjectDir.absolutePath, + GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR: "CORRELATOR", + GITHUB_DEPENDENCY_GRAPH_JOB_ID: "1", + GITHUB_DEPENDENCY_GRAPH_REF: "main", + GITHUB_DEPENDENCY_GRAPH_SHA: "123456", + GITHUB_DEPENDENCY_GRAPH_WORKSPACE: testProjectDir.absolutePath, DEPENDENCY_GRAPH_REPORT_DIR: reportsDir.absolutePath, GITHUB_OUTPUT: gitHubOutputFile.absolutePath ]