Merge branch 'master' into dev

.github/workflows/pake-cli.yaml

@@ -99,17 +99,8 @@ jobs:
         echo "install pake on local"
         npm install pake-cli
 
-    - name: rust cache restore
-      uses: actions/cache/restore@v3
-      id: cache_store
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          node_modules/pake-cli/src-tauri/target/
-        key: ${{ inputs.platform }}-cargo-${{ hashFiles('node_modules/pake-cli/src-tauri/Cargo.lock') }}
+    - name: rust cache
+      uses: Swatinem/rust-cache@v2
 
     - name: build with pake-cli
       shell: pwsh
@@ -133,15 +124,4 @@ jobs:
         name: output-${{ inputs.platform }}.zip
         path: node_modules/pake-cli/output/*
         retention-days: 3
-
-    - name: rust cache store
-      uses: actions/cache/save@v3
-      if: steps.cache_store.outputs.cache-hit != 'true'
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          node_modules/pake-cli/src-tauri/target/
-        key: ${{ inputs.platform }}-cargo-${{ hashFiles('node_modules/pake-cli/src-tauri/Cargo.lock') }}
+        

.github/workflows/pake_build.yaml

@@ -49,16 +49,8 @@ jobs:
         packages: libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra
         version: 1.1
 
-    - name: rust cache restore
-      uses: actions/cache/restore@v3
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          src-tauri/target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+    - name: rust cache
+      uses: Swatinem/rust-cache@v2
 
     - name: build for Ubuntu
       if: matrix.os == 'ubuntu-20.04'
@@ -75,11 +67,3 @@ jobs:
       shell: pwsh
       run: |
         npm run build:all-windows
-
-    - name: Upload files
-      # arg info: https://github.com/ncipollo/release-action#release-action
-      uses: ncipollo/release-action@v1
-      with:
-        allowUpdates: true
-        artifacts: "output/*/*.*"
-        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pake_build_with_cache.yaml

@@ -60,17 +60,8 @@ jobs:
         packages: libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra
         version: 1.1
 
-    - name: rust cache restore
-      uses: actions/cache/restore@v3
-      id: cache_store
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          src-tauri/target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+    - name: rust cache
+      uses: Swatinem/rust-cache@v2
 
     - name: build for Ubuntu
       if: matrix.os == 'ubuntu-20.04'
@@ -96,16 +87,4 @@ jobs:
         prerelease: ${{ inputs.is_pre_release }}
         artifacts: "output/*/*.*"
         tag: ${{ inputs.version }}
-        token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: rust cache store
-      uses: actions/cache/save@v3
-      if: steps.cache_store.outputs.cache-hit != 'true'
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          src-tauri/target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -326,6 +326,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Fechin</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/Milo123459">
+            <img src="https://avatars.githubusercontent.com/u/50248166?v=4" width="90;" alt="Milo123459"/>
+            <br />
+            <sub><b>Milo</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/princemaple">
             <img src="https://avatars.githubusercontent.com/u/1329716?v=4" width="90;" alt="princemaple"/>
@@ -346,15 +353,15 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Null</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/liusishan">
             <img src="https://avatars.githubusercontent.com/u/33129823?v=4" width="90;" alt="liusishan"/>
             <br />
             <sub><b>Liusishan</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/piaoyidage">
             <img src="https://avatars.githubusercontent.com/u/5135405?v=4" width="90;" alt="piaoyidage"/>