From 7c15d38689c9e1f523fb5493bd833c8bcb7c6121 Mon Sep 17 00:00:00 2001
From: Iisakki Rotko <iisakki.rotko@gmail.com>
Date: Mon, 18 Mar 2024 11:31:11 +0100
Subject: [PATCH] chore, ci: Bump upload/download-artifacts to v4

---
 .github/workflows/test.yaml | 39 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 0a4e88c03..b2a465d96 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -82,7 +82,7 @@ jobs:
 
       - name: Upload Test artifacts
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: solara-builds-${{ github.run_number }}
           path: |
@@ -145,7 +145,7 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: solara-builds-${{ github.run_number }}
 
@@ -204,8 +204,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: solara-builds-${{ github.run_number }}
 
@@ -255,16 +254,16 @@ jobs:
 
       - name: Upload Test artifacts
         if: github.event_name != 'schedule' || steps.install_no_lock.outputs.exit_code != 'NO_DIFF'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-integration-os${{ matrix.os }}-python${{ matrix.python-version }}-voila${{ matrix.voila }}-ipywidgets${{ matrix.ipywidgets }}
           path: test-results
 
       - name: Upload CI package locks
         if: (steps.install_no_lock.outputs.exit_code != 'NO_DIFF' && github.event_name == 'schedule') || steps.prepare.outputs.locks_exist == 'false'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ci-package-locks
+          name: ci-package-locks-integration-os${{ matrix.os }}-python${{ matrix.python-version }}-voila${{ matrix.voila }}-ipywidgets${{ matrix.ipywidgets }}
           path: ./**/${{ env.LOCK_FILE_LOCATION }}
 
   integration-test-vue3:
@@ -293,8 +292,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: solara-builds-${{ github.run_number }}
 
@@ -345,17 +343,17 @@ jobs:
         run: pytest tests/integration/widget_test.py --timeout=360 --video=retain-on-failure --output=test-results -vv -s --log-cli-level=warning
 
       - name: Upload Test artifacts
-        if: github.event_name != 'schedule' || steps.install_no_lock.outputs.exit_code != 'NO_DIFF'
-        uses: actions/upload-artifact@v3
+        if: steps.install_no_lock.outputs.exit_code != 'NO_DIFF'
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-integration-vue3-os${{ matrix.os }}-voila${{ matrix.voila }}-ipywidgets${{ matrix.ipywidgets }}
           path: test-results
 
       - name: Upload CI package locks
         if: (steps.install_no_lock.outputs.exit_code != 'NO_DIFF' && github.event_name == 'schedule') || steps.prepare.outputs.locks_exist == 'false'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ci-package-locks
+          name: ci-package-locks-integration-vue3-os${{ matrix.os }}-voila${{ matrix.voila }}-ipywidgets${{ matrix.ipywidgets }}
           path: ./**/${{ env.LOCK_FILE_LOCATION }}
 
   unit-test:
@@ -420,9 +418,9 @@ jobs:
 
       - name: Upload CI package locks
         if: (steps.install_no_lock.outputs.exit_code != 'NO_DIFF' && github.event_name == 'schedule') || steps.prepare.outputs.locks_exist == 'false'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ci-package-locks
+          name: ci-package-locks-unit-os${{ matrix.os }}-python${{ matrix.python }}-ipywidgets${{ matrix.ipywidgets }}
           path: ./**/${{ env.LOCK_FILE_LOCATION }}
 
   update-ci-package-locks:
@@ -443,9 +441,10 @@ jobs:
             echo "::set-output name=locks_exist::false"
           fi
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
-          name: ci-package-locks
+          pattern: ci-package-locks-*
+          merge-multiple: true
 
       - name: Update CI package locks
         if: github.event_name == 'schedule' || steps.prepare.outputs.locks_exist == 'false'
@@ -470,7 +469,7 @@ jobs:
         with:
           python-version: 3.7
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: solara-builds-${{ github.run_number }}