From c43f796067f6f9719de2294e43e894b0a2fa4576 Mon Sep 17 00:00:00 2001
From: Yadong Ding <ding_yadong@foxmail.com>
Date: Tue, 16 Jan 2024 14:30:59 +0800
Subject: [PATCH] action: bump upload-artifact/download-artifact v4

Since https://github.com/actions/download-artifact/issues/249 are fixed,
we can use the v4 version.

Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
---
 .github/workflows/benchmark.yml | 36 +++++++++++++--------------
 .github/workflows/convert.yml   | 44 ++++++++++++++++-----------------
 .github/workflows/release.yml   | 16 ++++++------
 .github/workflows/smoke.yml     | 24 +++++++++---------
 4 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index a3b40f23074..d374cd231f2 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -27,7 +27,7 @@ jobs:
       run: |
         make -e DOCKER=false nydusify-release
     - name: Upload Nydusify
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd/nydusify
@@ -47,7 +47,7 @@ jobs:
       run: |
         make release
     - name: Upload Nydus Binaries
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydus-artifact
         path: |
@@ -86,12 +86,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Download Nydus
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-artifact
         path: target/release
     - name: Download Nydusify
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd
@@ -106,7 +106,7 @@ jobs:
         export SNAPSHOTTER=overlayfs
         sudo -E make smoke-benchmark
     - name: Save BenchMark Result
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: benchmark-oci-${{ matrix.image }}
         path: smoke/${{ matrix.image }}-oci.json
@@ -133,12 +133,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Download Nydus
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-artifact
         path: target/release
     - name: Download Nydusify
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd
@@ -152,7 +152,7 @@ jobs:
         export BENCHMARK_METRIC_FILE=${{ matrix.image }}-fsversion-v5.json
         sudo -E make smoke-benchmark
     - name: Save BenchMark Result
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: benchmark-fsversion-v5-${{ matrix.image }}
         path: smoke/${{ matrix.image }}-fsversion-v5.json
@@ -179,12 +179,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Download Nydus
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-artifact
         path: target/release
     - name: Download Nydusify
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd
@@ -198,7 +198,7 @@ jobs:
         export BENCHMARK_METRIC_FILE=${{ matrix.image }}-fsversion-v6.json
         sudo -E make smoke-benchmark
     - name: Save BenchMark Result
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: benchmark-fsversion-v6-${{ matrix.image }}
         path: smoke/${{ matrix.image }}-fsversion-v6.json
@@ -225,12 +225,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Download Nydus
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-artifact
         path: target/release
     - name: Download Nydusify
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd
@@ -244,7 +244,7 @@ jobs:
         export BENCHMARK_METRIC_FILE=${{ matrix.image }}-zran.json
         sudo -E make smoke-benchmark
     - name: Save BenchMark Result
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: benchmark-zran-${{ matrix.image }}
         path: smoke/${{ matrix.image }}-zran.json
@@ -271,22 +271,22 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Download benchmark-oci
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: benchmark-oci-${{ matrix.image }}
         path: benchmark-result
     - name: Download benchmark-fsversion-v5
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: benchmark-fsversion-v5-${{ matrix.image }}
         path: benchmark-result
     - name: Download benchmark-fsversion-v6
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: benchmark-fsversion-v6-${{ matrix.image }}
         path: benchmark-result
     - name: Download benchmark-zran
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: benchmark-zran-${{ matrix.image }}
         path: benchmark-result
diff --git a/.github/workflows/convert.yml b/.github/workflows/convert.yml
index d4d96189eee..dca11d2aead 100644
--- a/.github/workflows/convert.yml
+++ b/.github/workflows/convert.yml
@@ -29,7 +29,7 @@ jobs:
         curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.54.2
         make -e DOCKER=false nydusify-release
     - name: Upload Nydusify
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd/nydusify
@@ -49,7 +49,7 @@ jobs:
       run: |
         make release
     - name: Upload Nydus Binaries
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydus-artifact
         path: |
@@ -68,7 +68,7 @@ jobs:
           cd erofs-utils && git checkout v1.6 && git apply ../${{ env.FSCK_PATCH_PATH }} && ./autogen.sh && ./configure && make && cd ..
           sudo cp erofs-utils/fsck/fsck.erofs /usr/local/bin/
       - name: Upload fsck.erofs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: fsck-erofs-artifact
           path: |
@@ -87,17 +87,17 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Download Nydus
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nydus-artifact
           path: /usr/local/bin
       - name: Download Nydusify
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nydusify-artifact
           path: /usr/local/bin
       - name: Download fsck.erofs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: fsck-erofs-artifact
           path: /usr/local/bin
@@ -143,7 +143,7 @@ jobs:
             sudo rm -rf ./output
           done
       - name: Save Nydusify Metric
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: convert-zran-metric
           path: convert-zran
@@ -161,12 +161,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Download Nydus
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nydus-artifact
           path: /usr/local/bin
       - name: Download Nydusify
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nydusify-artifact
           path: /usr/local/bin
@@ -197,7 +197,7 @@ jobs:
                 --target localhost:5000/$I:nydus-nightly-v5
           done
       - name: Save Nydusify Metric
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: convert-native-v5-metric
           path: convert-native-v5
@@ -215,17 +215,17 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Download Nydus
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nydus-artifact
           path: /usr/local/bin
       - name: Download Nydusify
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nydusify-artifact
           path: /usr/local/bin
       - name: Download fsck.erofs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: fsck-erofs-artifact
           path: /usr/local/bin
@@ -260,7 +260,7 @@ jobs:
             sudo rm -rf ./output
           done
       - name: Save Nydusify Metric
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: convert-native-v6-metric
           path: convert-native-v6
@@ -278,17 +278,17 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Download Nydus
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
           name: nydus-artifact
           path: /usr/local/bin
       - name: Download Nydusify
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
           name: nydusify-artifact
           path: /usr/local/bin
       - name: Download fsck.erofs
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
           name: fsck-erofs-artifact
           path: /usr/local/bin
@@ -325,7 +325,7 @@ jobs:
             sudo rm -rf ./output
           done
       - name: Save Nydusify Metric
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: convert-native-v6-batch-metric
           path: convert-native-v6-batch
@@ -337,22 +337,22 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Download Zran Metric
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: convert-zran-metric
           path: convert-zran
       - name: Download V5 Metric
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: convert-native-v5-metric
           path: convert-native-v5
       - name: Download V6 Metric
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: convert-native-v6-metric
           path: convert-native-v6
       - name: Download V6 Batch Metric
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
           name: convert-native-v6-batch-metric
           path: convert-native-v6-batch
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index af9091dfd4e..2f3413fc804 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,7 +38,7 @@ jobs:
         sudo cp -r misc/configs .
         sudo chown -R $(id -un):$(id -gn) . ~/.cargo/
     - name: store-artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydus-artifacts-linux-${{ matrix.arch }}
         path: |
@@ -74,7 +74,7 @@ jobs:
         sudo cp -r misc/configs .
         sudo chown -R $(id -un):$(id -gn) . ~/.cargo/
     - name: store-artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydus-artifacts-darwin-${{ matrix.arch }}
         path: |
@@ -104,7 +104,7 @@ jobs:
         sudo mv contrib/nydusify/cmd/nydusify .
         sudo mv contrib/nydus-overlayfs/bin/nydus-overlayfs .
     - name: store-artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydus-artifacts-linux-${{ matrix.arch }}
         path: |
@@ -122,7 +122,7 @@ jobs:
     needs: [nydus-linux, contrib-linux]
     steps:
     - name: download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-artifacts-${{ matrix.os }}-${{ matrix.arch }}
         path: nydus-static
@@ -138,7 +138,7 @@ jobs:
         sha256sum $tarball > $shasum
         echo "tarball_shasum=${shasum}" >> $GITHUB_ENV
     - name: store-artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydus-release-tarball
         path: |
@@ -155,7 +155,7 @@ jobs:
     needs: [nydus-macos]
     steps:
     - name: download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-artifacts-${{ matrix.os }}-${{ matrix.arch }}
         path: nydus-static
@@ -171,7 +171,7 @@ jobs:
         sha256sum $tarball > $shasum
         echo "tarball_shasum=${shasum}" >> $GITHUB_ENV
     - name: store-artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydus-release-tarball
         path: |
@@ -183,7 +183,7 @@ jobs:
     needs: [prepare-tarball-linux, prepare-tarball-darwin]
     steps:
     - name: download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-release-tarball
         path: nydus-tarball
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index bcf46015a64..f4aeebbf6b7 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -34,7 +34,7 @@ jobs:
         make -e DOCKER=false GOARCH=${{ matrix.arch }} contrib-release
     - name: Upload Nydusify
       if: matrix.arch == 'amd64'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd
@@ -64,7 +64,7 @@ jobs:
         sudo mv target/$RUST_TARGET/release/nydus-image .
     - name: Upload Nydus Binaries
       if: matrix.arch == 'amd64'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nydus-artifact
         path: |
@@ -106,13 +106,13 @@ jobs:
       uses: jpribyl/action-docker-layer-caching@v0.1.0
       continue-on-error: true
     - name: Download Nydus
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-artifact
         path: |
           target/release
     - name: Download Nydusify
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd
@@ -195,7 +195,7 @@ jobs:
         curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.54.2
         make -e DOCKER=false contrib-test
     - name: Upload contrib coverage file
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: contrib-test-coverage-artifact
         path: |
@@ -223,7 +223,7 @@ jobs:
           CARGO_BIN=$(which cargo)
           sudo -E CARGO=${CARGO_BIN} make coverage-codecov
       - name: Upload nydus coverage file
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nydus-test-coverage-artifact
           path: |
@@ -235,11 +235,11 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Download nydus coverage file
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-test-coverage-artifact
     - name: Download contrib coverage file
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: contrib-test-coverage-artifact
     - name: Upload coverage to Codecov
@@ -269,12 +269,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Download Nydus
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-artifact
         path: target/release
     - name: Download Nydusify
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd
@@ -293,12 +293,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Download Nydus
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydus-artifact
         path: target/release
     - name: Download Nydusify
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: nydusify-artifact
         path: contrib/nydusify/cmd