Merge branch 'main' into dependabot/github_actions/actions/checkout-4

actions · Dec 21, 2023 · 53e19ad · 53e19ad
2 parents 405e426 + 0252fc4
commit 53e19ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/test-hosted-runners.yml b/.github/workflows/test-hosted-runners.yml
@@ -31,12 +31,13 @@ jobs:
     - name: Upload Pages artifact
       uses: ./
       with:
+        name: pages-artifact-${{ matrix.os }}
         path: artifact
 
     - name: Download artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-          name: github-pages
+          name: pages-artifact-${{ matrix.os }}
           path: artifact2
 
     - name: Extract artifact

diff --git a/action.yml b/action.yml
@@ -14,6 +14,10 @@ inputs:
     description: "Duration after which artifact will expire in days."
     required: false
     default: "1"
+outputs:
+  artifact_id:
+    description: "The ID of the artifact that was uploaded."
+    value: ${{ steps.upload-artifact.outputs.artifact-id }}
 runs:
   using: composite
   steps:
@@ -63,7 +67,8 @@ runs:
         INPUT_PATH: ${{ inputs.path }}
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      id: upload-artifact
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.name }}
         path: ${{ runner.temp }}/artifact.tar