From fd9801a4b547ad903a4d0fde56987ca122d08606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio.lopez@trailofbits.com>
Date: Wed, 3 Jan 2024 16:18:16 -0300
Subject: [PATCH] Upgrade actions/upload-artifact and actions/download-artifact
 to v4

---
 .github/workflows/ci.yml      | 6 +++---
 .github/workflows/release.yml | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c302d84c0..a3351446f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -158,7 +158,7 @@ jobs:
         run: GZIP=-9 tar -czf echidna.tar.gz -C $APPDATA/local/bin/ echidna.exe
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: echidna-${{ runner.os }}
           path: echidna.tar.gz
@@ -172,7 +172,7 @@ jobs:
 
       - name: Upload testsuite
         if: runner.os != 'macOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: echidna-testsuite-${{ runner.os }}
           path: echidna-testsuite*
@@ -221,7 +221,7 @@ jobs:
           SOLC_VER: ${{ matrix.solc }}
 
       - name: Download testsuite
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
          name: echidna-testsuite-${{ runner.os }}
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 99f5450c0..70adf4669 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -73,9 +73,9 @@ jobs:
           tar -czf "echidna-${{ steps.version.outputs.version }}-${{ matrix.tuple }}.tar.gz" -C ./redistributable/bin/ echidna
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: echidna-redistributable
+          name: echidna-redistributable-${{ matrix.tuple }}
           path: echidna-${{ steps.version.outputs.version }}-${{ matrix.tuple }}.tar.gz
 
   release:
@@ -92,9 +92,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download binaries
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: echidna-redistributable
+          pattern: echidna-redistributable-*
+          merge-multiple: true
 
       - name: Sign binaries
         uses: sigstore/gh-action-sigstore-python@v2.1.1