From c94570e760c4f3624316d95744ee2711294e012e Mon Sep 17 00:00:00 2001
From: Yadong Ding <ding_yadong@foxmail.com>
Date: Sun, 7 May 2023 11:28:21 +0800
Subject: [PATCH 1/2] action: remove target-dir input in rust cache

Since we update the rust cache version from v1 to v2.2.0, the target-dir
is useless, and the ./target will be cached default.

Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
---
 .github/workflows/integration.yml | 3 ---
 .github/workflows/release.yml     | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 87d071f5a9d..bbf1a1c9adb 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -45,11 +45,8 @@ jobs:
       - name: Cache cargo
         uses: Swatinem/rust-cache@v2.2.0
         with:
-          target-dir: |
-            ./target
           cache-on-failure: true
           key: ${{ runner.os }}-cargo-${{ matrix.arch }}
-
       - name: Build nydus-rs
         run: |
           declare -A rust_target_map=( ["amd64"]="x86_64-unknown-linux-musl" ["arm64"]="aarch64-unknown-linux-musl")
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 60f5476e837..5af6b0e1f8d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,8 +23,6 @@ jobs:
     - name: Cache cargo
       uses: Swatinem/rust-cache@v2.2.0
       with:
-        target-dir: |
-          ./target
         cache-on-failure: true
         key: ${{ runner.os }}-cargo-${{ matrix.arch }}
     - name: Build nydus-rs
@@ -59,8 +57,6 @@ jobs:
     - name: Cache cargo
       uses: Swatinem/rust-cache@v2.2.0
       with:
-        target-dir: |
-          ./target
         cache-on-failure: true
         key: ${{ runner.os }}-cargo-${{ matrix.arch }}
     - name: build

From 672e52342a255d5a57a75241c5ecae933880b0cc Mon Sep 17 00:00:00 2001
From: Yadong Ding <ding_yadong@foxmail.com>
Date: Sun, 7 May 2023 11:30:36 +0800
Subject: [PATCH 2/2] action: update actions version to use Node.js 16

Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
---
 .github/workflows/release.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5af6b0e1f8d..fbb45eba064 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         arch: [amd64, arm64, ppc64le, riscv64]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Cache cargo
       uses: Swatinem/rust-cache@v2.2.0
       with:
@@ -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@v2
+      uses: actions/upload-artifact@v3
       with:
         name: nydus-artifacts-linux-${{ matrix.arch }}
         path: |
@@ -53,7 +53,7 @@ jobs:
       matrix:
         arch: [amd64, arm64]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Cache cargo
       uses: Swatinem/rust-cache@v2.2.0
       with:
@@ -66,7 +66,7 @@ jobs:
         sudo cp -r misc/configs .
         sudo chown -R $(id -un):$(id -gn) . ~/.cargo/
     - name: store-artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: nydus-artifacts-darwin-${{ matrix.arch }}
         path: |
@@ -83,12 +83,12 @@ jobs:
     env:
       DOCKER: false
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v3
       with:
         go-version: '1.18'
     - name: cache go mod
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: /go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/contrib/nydusify/go.sum', '**/contrib/ctr-remote/go.sum', '**/contrib/nydus-overlayfs/go.sum') }}
@@ -101,7 +101,7 @@ jobs:
         sudo mv contrib/nydusify/cmd/nydusify .
         sudo mv contrib/nydus-overlayfs/bin/nydus-overlayfs .
     - name: store-artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: nydus-artifacts-linux-${{ matrix.arch }}
         path: |
@@ -119,7 +119,7 @@ jobs:
     needs: [nydus-linux, contrib-linux]
     steps:
     - name: download artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: nydus-artifacts-${{ matrix.os }}-${{ matrix.arch }}
         path: nydus-static
@@ -135,7 +135,7 @@ jobs:
         sha256sum $tarball > $shasum
         echo "tarball_shasum=${shasum}" >> $GITHUB_ENV
     - name: store-artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: nydus-release-tarball
         path: |
@@ -152,7 +152,7 @@ jobs:
     needs: [nydus-macos]
     steps:
     - name: download artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: nydus-artifacts-${{ matrix.os }}-${{ matrix.arch }}
         path: nydus-static
@@ -168,7 +168,7 @@ jobs:
         sha256sum $tarball > $shasum
         echo "tarball_shasum=${shasum}" >> $GITHUB_ENV
     - name: store-artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: nydus-release-tarball
         path: |
@@ -180,7 +180,7 @@ jobs:
     needs: [prepare-tarball-linux, prepare-tarball-darwin]
     steps:
     - name: download artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: nydus-release-tarball
         path: nydus-tarball