From e699324f6a8d3a999660aabec48ba1d5e9148345 Mon Sep 17 00:00:00 2001 From: Konrad Pabjan Date: Thu, 26 Oct 2023 13:48:59 -0400 Subject: [PATCH 1/6] Upload pages artifact with upload-artifact@v4-beta --- action.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index d4c9a9f..7b6b5b2 100644 --- 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-beta with: name: ${{ inputs.name }} path: ${{ runner.temp }}/artifact.tar From ecdd3edff76d306e98d046dfc846e651354ac144 Mon Sep 17 00:00:00 2001 From: Konrad Pabjan Date: Thu, 26 Oct 2023 14:50:49 -0400 Subject: [PATCH 2/6] Switch to using download@v4-beta --- .github/workflows/test-hosted-runners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-hosted-runners.yml b/.github/workflows/test-hosted-runners.yml index 5b0dab9..cc0730d 100644 --- a/.github/workflows/test-hosted-runners.yml +++ b/.github/workflows/test-hosted-runners.yml @@ -34,7 +34,7 @@ jobs: path: artifact - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4-beta with: name: github-pages path: artifact2 From ef95519d72c61a2dd9137c79470bacfc5bdbbaa8 Mon Sep 17 00:00:00 2001 From: Konrad Pabjan Date: Thu, 26 Oct 2023 14:57:05 -0400 Subject: [PATCH 3/6] Unique artifact name per job --- .github/workflows/test-hosted-runners.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-hosted-runners.yml b/.github/workflows/test-hosted-runners.yml index cc0730d..ea4a3c4 100644 --- a/.github/workflows/test-hosted-runners.yml +++ b/.github/workflows/test-hosted-runners.yml @@ -31,6 +31,7 @@ jobs: - name: Upload Pages artifact uses: ./ with: + name: pages-artifact ${{ matrix.os }} path: artifact - name: Download artifact From 241a975ec2c9ecb3effc2875203cce4b9e25078d Mon Sep 17 00:00:00 2001 From: Konrad Pabjan Date: Thu, 26 Oct 2023 14:59:03 -0400 Subject: [PATCH 4/6] Correct artifact name during download --- .github/workflows/test-hosted-runners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-hosted-runners.yml b/.github/workflows/test-hosted-runners.yml index ea4a3c4..38db353 100644 --- a/.github/workflows/test-hosted-runners.yml +++ b/.github/workflows/test-hosted-runners.yml @@ -37,7 +37,7 @@ jobs: - name: Download artifact uses: actions/download-artifact@v4-beta with: - name: github-pages + name: pages-artifact ${{ matrix.os }} path: artifact2 - name: Extract artifact From eb31309b6cdf94f92e47abb173a0cbed9b5056cf Mon Sep 17 00:00:00 2001 From: Konrad Pabjan Date: Fri, 27 Oct 2023 10:12:08 -0400 Subject: [PATCH 5/6] Update artifact names in tests --- .github/workflows/test-hosted-runners.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-hosted-runners.yml b/.github/workflows/test-hosted-runners.yml index 38db353..7fb829e 100644 --- a/.github/workflows/test-hosted-runners.yml +++ b/.github/workflows/test-hosted-runners.yml @@ -31,13 +31,13 @@ jobs: - name: Upload Pages artifact uses: ./ with: - name: pages-artifact ${{ matrix.os }} + name: pages-artifact-${{ matrix.os }} path: artifact - name: Download artifact uses: actions/download-artifact@v4-beta with: - name: pages-artifact ${{ matrix.os }} + name: pages-artifact-${{ matrix.os }} path: artifact2 - name: Extract artifact From 1228e656868935b3c8b085b28ea3b89b5763c64e Mon Sep 17 00:00:00 2001 From: Konrad Pabjan Date: Fri, 27 Oct 2023 11:19:41 -0400 Subject: [PATCH 6/6] Update action.yml Co-authored-by: James M. Greene --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 7b6b5b2..05244e3 100644 --- a/action.yml +++ b/action.yml @@ -15,7 +15,7 @@ inputs: required: false default: "1" outputs: - artifact-id: + artifact_id: description: "The ID of the artifact that was uploaded." value: ${{ steps.upload-artifact.outputs.artifact-id }} runs: