Use upload and download v4

neo4j · Jan 18, 2024 · 13d6e36 · 13d6e36
1 parent eec5ad3
commit 13d6e36
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/docs-deploy-surge.yml b/.github/workflows/docs-deploy-surge.yml
@@ -21,6 +21,12 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    # with download-artifact v4 we need to use a matrix to get HTML and changelog artifacts
+    # because the artifacts will have been uploaded separately to ensure unique names
+    strategy:
+      matrix:
+        required-artifacts: ["docs", "changelog"]
+
     steps:
       - name: "Download built documentation"
         uses: actions/[email protected]
@@ -35,7 +41,7 @@ jobs:
                run_id: ${{ env.RUN_ID }},
             });
             var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "docs"
+              return artifact.name == "${{ matrix.required-artifacts }}}"
             })[0];
             var download = await github.rest.actions.downloadArtifact({
                owner: context.repo.owner,
@@ -44,9 +50,9 @@ jobs:
                archive_format: 'zip',
             });
             var fs = require('fs');
-            fs.writeFileSync('${{ env.WORKSPACE }}/docs.zip', Buffer.from(download.data));
+            fs.writeFileSync('${{ env.WORKSPACE }}/${{ matrix.required-artifacts }}.zip', Buffer.from(download.data));
       
-      - run: unzip docs.zip
+      - run: unzip ${{ matrix.required-artifacts }}.zip
 
       - id: get-deploy-id
         run: |

diff --git a/.github/workflows/reusable-docs-build.yml b/.github/workflows/reusable-docs-build.yml
@@ -96,23 +96,22 @@ jobs:
       run: echo $DEPLOY_ID > ./build/deployid
 
     - name: Upload HTML artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: docs
         path: build/
         retention-days: ${{ inputs.retain-artifacts }}          
 
     - name: Upload Log artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: antora-log
         path: build/log
         retention-days: ${{ inputs.retain-artifacts }}
 
     - name: Upload Page List artifact
       id: page-list-artifact
-      if: ${{ inputs.pageList }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: page-list
         path: build/site/.meta/pageList

diff --git a/.github/workflows/reusable-docs-links.yml b/.github/workflows/reusable-docs-links.yml
@@ -79,7 +79,7 @@ jobs:
     # upload artifacts
 
     - name: Save log
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linklog
         path: link-log.txt

diff --git a/.github/workflows/reusable-docs-pr-changes.yml b/.github/workflows/reusable-docs-pr-changes.yml
@@ -114,9 +114,10 @@ jobs:
             
             writeFileSync(`${WORKSPACE}/changelog`, Buffer.from(comment));
 
+      # For upload-artifact v4 we need to provide a unique artifact name
       - name: Upload changelog
         if: ${{ hashFiles('changelog') != '' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
             name: changelog
             path: changelog