Merge pull request wildfly#18168 from kabir/update-dependency-tree-ch…

…ecker Include hidden files when uploading the artifact; use action to download
darranl · Sep 4, 2024 · ac7bdc6 · ac7bdc6
2 parents 40236f3 + 3bad147
commit ac7bdc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 26 deletions.
diff --git a/.github/workflows/dep-diff-pull_request.yml b/.github/workflows/dep-diff-pull_request.yml
@@ -188,4 +188,5 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: input-artifacts
-          path: ${{ steps.prepare.outputs.artifacts }}
+          path: ${{ steps.prepare.outputs.artifacts }}
+          include-hidden-files: true
diff --git a/.github/workflows/dep-diff-workflow_run.yml b/.github/workflows/dep-diff-workflow_run.yml
@@ -24,36 +24,15 @@ jobs:
       ${{ github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' }}
     steps:
-      - name: Download artifacts
-        # It would have been nice to be able to use actions/download-artifact@v2
-        # for this, but as the artifacts are uploaded by another workflow it does
-        # not seem possible - so we need to do this stuff instead
-        uses: actions/github-script@v7.0.1
+      - uses: actions/download-artifact@v4
         with:
-          script: |
-            var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: ${{github.event.workflow_run.id }},
-            });
-            console.log(artifacts);
-            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "input-artifacts"
-            })[0];
-            var download = await github.rest.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
-            var fs = require('fs');
-            fs.writeFileSync('${{github.workspace}}/input.zip', Buffer.from(download.data));
-
+          name: input-artifacts
+          github-token: ${{ github.token }}
+          run-id: ${{ github.event.workflow_run.id }}
 
       - name: Set needed env vars in outputs
         id: prepare
         run: |
-          unzip input.zip
           echo current directory contents
           ls -al
           echo "deps_ok_label_name=${DEPS_OK_LABEL_NAME}" >> $GITHUB_OUTPUT