From a70e115c9117756738a7f7c94641fb65c0610583 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 17:26:09 +0000
Subject: [PATCH 1/2] Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-test-riscv64.yml | 2 +-
 .github/workflows/build-wheels.yml       | 4 ++--
 .github/workflows/doc-html-pdf.yml       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-test-riscv64.yml b/.github/workflows/build-test-riscv64.yml
index be238c0c6..6d7faba26 100644
--- a/.github/workflows/build-test-riscv64.yml
+++ b/.github/workflows/build-test-riscv64.yml
@@ -65,7 +65,7 @@ jobs:
             '
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: packages
           path: ./dist
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index 8cac8a0f8..7877928ca 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -150,7 +150,7 @@ jobs:
         pipx run --spec='cibuildwheel==2.16.2' cibuildwheel --output-dir dist 2>&1
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: packages
         path: ./dist
@@ -193,7 +193,7 @@ jobs:
         python -m build --sdist --outdir dist .
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: packages
         path: ./dist
diff --git a/.github/workflows/doc-html-pdf.yml b/.github/workflows/doc-html-pdf.yml
index 1313839aa..7bed3033e 100644
--- a/.github/workflows/doc-html-pdf.yml
+++ b/.github/workflows/doc-html-pdf.yml
@@ -42,7 +42,7 @@ jobs:
         pdfOptions: '{"margin": {"top": "1cm", "left": "1cm", "right": "1cm", "bottom": "1cm"}}'
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Proof-of-Space-Document
         path: ./documents/proof_of_space.pdf

From 6cff5a8746cafcc06df4e36b71ff010aa0e5048b Mon Sep 17 00:00:00 2001
From: Chris Marslender <chrismarslender@gmail.com>
Date: Fri, 17 May 2024 14:03:52 -0500
Subject: [PATCH 2/2] matrix specific names + merge-multiple true for artifacts

---
 .github/workflows/build-test-riscv64.yml | 5 +++--
 .github/workflows/build-wheels.yml       | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-test-riscv64.yml b/.github/workflows/build-test-riscv64.yml
index 6d7faba26..e42bf5b15 100644
--- a/.github/workflows/build-test-riscv64.yml
+++ b/.github/workflows/build-test-riscv64.yml
@@ -67,7 +67,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: packages
+          name: packages-${{ matrix.os }}-${{ matrix.python.major-dot-minor }}
           path: ./dist
           if-no-files-found: error
   upload:
@@ -90,7 +90,8 @@ jobs:
         if: env.RELEASE == 'true'
         uses: actions/download-artifact@v3
         with:
-          name: packages
+          merge-multiple: true
+          pattern: packages-*
           path: ./dist
 
       - name: Configure AWS credentials
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index 7877928ca..2c7f29129 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -152,7 +152,7 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: packages
+        name: packages-${{ matrix.os.name }}-${{ matrix.python.major-dot-minor }}-${{ matrix.arch.name }}
         path: ./dist
 
   build-sdist:
@@ -195,7 +195,7 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: packages
+        name: packages-sdist-${{ matrix.os.name }}-${{ matrix.python.major-dot-minor }}-${{ matrix.arch.name }}
         path: ./dist
 
   check:
@@ -284,7 +284,8 @@ jobs:
     - name: Download artifacts
       uses: actions/download-artifact@v3
       with:
-        name: packages
+        merge-multiple: true
+        pattern: packages-*
         path: ./dist
 
     - name: Publish distribution to PyPI