mirror of
				https://github.com/gradle/gradle-build-action.git
				synced 2025-11-04 09:50:23 +08:00 
			
		
		
		
	Improve compat with dependency-review-action
When using 'download-and-submit' for dependency graphs, we now run the submission immediately instead of waiting until the post-action. This allows a single job to both submit the graph and run the dependency review action.
This commit is contained in:
		@@ -14,8 +14,13 @@ import {DependencyGraphOption, getJobMatrix} from './input-params'
 | 
			
		||||
 | 
			
		||||
const DEPENDENCY_GRAPH_ARTIFACT = 'dependency-graph'
 | 
			
		||||
 | 
			
		||||
export function setup(option: DependencyGraphOption): void {
 | 
			
		||||
    if (option === DependencyGraphOption.Disabled || option === DependencyGraphOption.DownloadAndSubmit) {
 | 
			
		||||
export async function setup(option: DependencyGraphOption): Promise<void> {
 | 
			
		||||
    if (option === DependencyGraphOption.Disabled) {
 | 
			
		||||
        return
 | 
			
		||||
    }
 | 
			
		||||
    // Download and submit early, for compatability with dependency review.
 | 
			
		||||
    if (option === DependencyGraphOption.DownloadAndSubmit) {
 | 
			
		||||
        await downloadAndSubmitDependencyGraphs()
 | 
			
		||||
        return
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -35,6 +40,7 @@ export function setup(option: DependencyGraphOption): void {
 | 
			
		||||
export async function complete(option: DependencyGraphOption): Promise<void> {
 | 
			
		||||
    switch (option) {
 | 
			
		||||
        case DependencyGraphOption.Disabled:
 | 
			
		||||
        case DependencyGraphOption.DownloadAndSubmit: // Performed in setup
 | 
			
		||||
            return
 | 
			
		||||
        case DependencyGraphOption.Generate:
 | 
			
		||||
            await uploadDependencyGraphs()
 | 
			
		||||
@@ -42,8 +48,6 @@ export async function complete(option: DependencyGraphOption): Promise<void> {
 | 
			
		||||
        case DependencyGraphOption.GenerateAndSubmit:
 | 
			
		||||
            await submitDependencyGraphs(await uploadDependencyGraphs())
 | 
			
		||||
            return
 | 
			
		||||
        case DependencyGraphOption.DownloadAndSubmit:
 | 
			
		||||
            await downloadAndSubmitDependencyGraphs()
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -38,7 +38,7 @@ export async function setup(): Promise<void> {
 | 
			
		||||
 | 
			
		||||
    core.saveState(CACHE_LISTENER, cacheListener.stringify())
 | 
			
		||||
 | 
			
		||||
    dependencyGraph.setup(params.getDependencyGraphOption())
 | 
			
		||||
    await dependencyGraph.setup(params.getDependencyGraphOption())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export async function complete(): Promise<void> {
 | 
			
		||||
@@ -62,7 +62,7 @@ export async function complete(): Promise<void> {
 | 
			
		||||
        logJobSummary(buildResults, cacheListener)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    dependencyGraph.complete(params.getDependencyGraphOption())
 | 
			
		||||
    await dependencyGraph.complete(params.getDependencyGraphOption())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async function determineGradleUserHome(): Promise<string> {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user