mirror of
				https://github.com/gradle/gradle-build-action.git
				synced 2025-11-04 09:58:56 +08:00 
			
		
		
		
	Update to latest plugin version
This commit is contained in:
		@@ -21,10 +21,10 @@ 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_DEPENDENCY_GRAPH_JOB_CORRELATOR', jobCorrelator)
 | 
			
		||||
    core.exportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_ID', github.context.runId)
 | 
			
		||||
    core.exportVariable('GITHUB_JOB_CORRELATOR', jobCorrelator)
 | 
			
		||||
    core.exportVariable('GITHUB_JOB_ID', github.context.runId)
 | 
			
		||||
    core.exportVariable(
 | 
			
		||||
        'GITHUB_DEPENDENCY_GRAPH_REPORT_DIR',
 | 
			
		||||
        'DEPENDENCY_GRAPH_REPORT_DIR',
 | 
			
		||||
        path.resolve(layout.workspaceDirectory(), 'dependency-graph-reports')
 | 
			
		||||
    )
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@ buildscript {
 | 
			
		||||
    maven { url "https://plugins.gradle.org/m2/" }
 | 
			
		||||
  }
 | 
			
		||||
  dependencies {
 | 
			
		||||
    classpath "org.gradle:github-dependency-graph-gradle-plugin:0.0.6"
 | 
			
		||||
    classpath "org.gradle:github-dependency-graph-gradle-plugin:0.0.7"
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
apply plugin: org.gradle.github.GitHubDependencyGraphPlugin
 | 
			
		||||
 
 | 
			
		||||
@@ -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 jobCorrelator = ensureUniqueJobCorrelator(System.env.GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR)
 | 
			
		||||
  def jobCorrelator = ensureUniqueJobCorrelator(System.env.GITHUB_JOB_CORRELATOR)
 | 
			
		||||
 | 
			
		||||
  if (jobCorrelator == null) {
 | 
			
		||||
    println "::warning::No dependency snapshot generated for step: report file for '${jobCorrelator}' created in earlier step. Each build invocation requires a unique job correlator: specify GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR var for this step."
 | 
			
		||||
    println "::warning::No dependency snapshot generated for step: report file for '${jobCorrelator}' created in earlier step. Each build invocation requires a unique job correlator: specify GITHUB_JOB_CORRELATOR var for this step."
 | 
			
		||||
    return
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -34,7 +34,7 @@ apply from: 'github-dependency-graph-gradle-plugin-apply.groovy'
 | 
			
		||||
 * - When found, this value is set as a System property override.
 | 
			
		||||
 */
 | 
			
		||||
String ensureUniqueJobCorrelator(String jobCorrelator) {
 | 
			
		||||
    def reportDir = System.env.GITHUB_DEPENDENCY_GRAPH_REPORT_DIR
 | 
			
		||||
    def reportDir = System.env.DEPENDENCY_GRAPH_REPORT_DIR
 | 
			
		||||
    def reportFile = new File(reportDir, jobCorrelator + ".json")
 | 
			
		||||
    if (!reportFile.exists()) return jobCorrelator
 | 
			
		||||
 | 
			
		||||
@@ -43,7 +43,7 @@ String ensureUniqueJobCorrelator(String jobCorrelator) {
 | 
			
		||||
        def candidateCorrelator = jobCorrelator + "-" + i
 | 
			
		||||
        def candidateFile = new File(reportDir, candidateCorrelator + ".json")
 | 
			
		||||
        if (!candidateFile.exists()) {
 | 
			
		||||
           System.properties['org.gradle.github.env.GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR'] = candidateCorrelator
 | 
			
		||||
           System.properties['GITHUB_JOB_CORRELATOR'] = candidateCorrelator
 | 
			
		||||
           return candidateCorrelator
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user