Restrict download-and-submit to selected file

This commit is contained in:
daz 2024-07-16 13:45:14 -06:00
parent 36c24e793d
commit 22818445b3
No known key found for this signature in database
4 changed files with 21 additions and 5 deletions

View File

@ -21,7 +21,7 @@ env:
GITHUB_DEPENDENCY_GRAPH_REF: 'refs/tags/v0.0.1' # Use a different ref to avoid updating the real dependency graph for the repository GITHUB_DEPENDENCY_GRAPH_REF: 'refs/tags/v0.0.1' # Use a different ref to avoid updating the real dependency graph for the repository
jobs: jobs:
groovy-generate: groovy-upload:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -42,7 +42,7 @@ jobs:
working-directory: .github/workflow-samples/groovy-dsl working-directory: .github/workflow-samples/groovy-dsl
groovy-submit: groovy-submit:
needs: [groovy-generate] needs: [groovy-upload]
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- name: Checkout sources - name: Checkout sources
@ -54,6 +54,8 @@ jobs:
uses: ./setup-gradle uses: ./setup-gradle
with: with:
dependency-graph: download-and-submit dependency-graph: download-and-submit
env:
DEPENDENCY_GRAPH_DOWNLOAD_ARTIFACT_NAME: groovy-upload
kotlin-generate-and-submit: kotlin-generate-and-submit:
strategy: strategy:

View File

@ -80,6 +80,8 @@ jobs:
uses: ./dependency-submission uses: ./dependency-submission
with: with:
dependency-graph: download-and-submit dependency-graph: download-and-submit
env:
DEPENDENCY_GRAPH_DOWNLOAD_ARTIFACT_NAME: groovy-generate-and-upload-${{ matrix.os }}
kotlin-generate-and-submit: kotlin-generate-and-submit:
strategy: strategy:
@ -313,6 +315,8 @@ jobs:
build-root-directory: .github/workflow-samples/groovy-dsl build-root-directory: .github/workflow-samples/groovy-dsl
env: env:
DEPENDENCY_GRAPH_REPORT_DIR: '${{ github.workspace }}/custom/report-dir' DEPENDENCY_GRAPH_REPORT_DIR: '${{ github.workspace }}/custom/report-dir'
DEPENDENCY_GRAPH_DOWNLOAD_ARTIFACT_NAME: custom-report-dir-upload
- name: Check downloaded dependency graph - name: Check downloaded dependency graph
shell: bash shell: bash
run: | run: |

View File

@ -49,6 +49,10 @@ export class DependencyGraphConfig {
return path.resolve(getWorkspaceDirectory(), 'dependency-graph-reports') return path.resolve(getWorkspaceDirectory(), 'dependency-graph-reports')
} }
getDownloadArtifactName(): string | undefined {
return process.env['DEPENDENCY_GRAPH_DOWNLOAD_ARTIFACT_NAME']
}
static constructJobCorrelator(workflow: string, jobId: string, matrixJson: string): string { static constructJobCorrelator(workflow: string, jobId: string, matrixJson: string): string {
const matrixString = this.describeMatrix(matrixJson) const matrixString = this.describeMatrix(matrixJson)
const label = matrixString ? `${workflow}-${jobId}-${matrixString}` : `${workflow}-${jobId}` const label = matrixString ? `${workflow}-${jobId}-${matrixString}` : `${workflow}-${jobId}`

View File

@ -77,7 +77,7 @@ async function downloadAndSubmitDependencyGraphs(config: DependencyGraphConfig):
} }
try { try {
await submitDependencyGraphs(await downloadDependencyGraphs()) await submitDependencyGraphs(await downloadDependencyGraphs(config))
} catch (e) { } catch (e) {
warnOrFail(config, DependencyGraphOption.DownloadAndSubmit, e) warnOrFail(config, DependencyGraphOption.DownloadAndSubmit, e)
} }
@ -111,7 +111,7 @@ async function findAndUploadDependencyGraphs(config: DependencyGraphConfig): Pro
await uploadDependencyGraphs(await findDependencyGraphFiles(), config) await uploadDependencyGraphs(await findDependencyGraphFiles(), config)
} }
async function downloadDependencyGraphs(): Promise<string[]> { async function downloadDependencyGraphs(config: DependencyGraphConfig): Promise<string[]> {
const findBy = github.context.payload.workflow_run const findBy = github.context.payload.workflow_run
? { ? {
token: getGithubToken(), token: getGithubToken(),
@ -123,13 +123,19 @@ async function downloadDependencyGraphs(): Promise<string[]> {
const artifactClient = new DefaultArtifactClient() const artifactClient = new DefaultArtifactClient()
const dependencyGraphArtifacts = ( let dependencyGraphArtifacts = (
await artifactClient.listArtifacts({ await artifactClient.listArtifacts({
latest: true, latest: true,
findBy findBy
}) })
).artifacts.filter(artifact => artifact.name.startsWith(DEPENDENCY_GRAPH_PREFIX)) ).artifacts.filter(artifact => artifact.name.startsWith(DEPENDENCY_GRAPH_PREFIX))
const artifactName = config.getDownloadArtifactName()
if (artifactName) {
core.info(`Filtering for artifacts ending with ${artifactName}`)
dependencyGraphArtifacts = dependencyGraphArtifacts.filter(artifact => artifact.name.includes(artifactName))
}
for (const artifact of dependencyGraphArtifacts) { for (const artifact of dependencyGraphArtifacts) {
const downloadedArtifact = await artifactClient.downloadArtifact(artifact.id, { const downloadedArtifact = await artifactClient.downloadArtifact(artifact.id, {
findBy findBy