chore: fix wasm auto release and upgrade rust-cache in CI (#456)

RingsNetwork · Jul 19, 2023 · 2b7312b · 2b7312b
1 parent a991cc7
commit 2b7312b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 22 deletions.
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
@@ -80,9 +80,9 @@ jobs:
           rustup show
 
       # If you need to reset the cache version, increment the number after `v`
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: auto-release-${{ steps.target.outputs.target }}-v1
+          shared-key: auto-release-${{ steps.target.outputs.target }}-v1
 
       - name: Build
         run: |
@@ -132,9 +132,9 @@ jobs:
           sudo apt-get install -y musl-tools
 
       # If you need to reset the cache version, increment the number after `v`
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: auto-release-${{ steps.target.outputs.target }}-v1
+          shared-key: auto-release-${{ steps.target.outputs.target }}-v1
 
       - name: Build
         run: |
@@ -148,8 +148,6 @@ jobs:
           path: rings-${{ needs.gen_version.outputs.version }}-${{ steps.target.outputs.target }}.zip
           retention-days: 1
 
-
-
   build_browser:
     needs: gen_version
     name: build browser version binary
@@ -186,28 +184,26 @@ jobs:
           rustup show
 
       # If you need to reset the cache version, increment the number after `v`
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: auto-release-${{ steps.target.outputs.target }}-v1
+          shared-key: auto-release-${{ steps.target.outputs.target }}-v1
 
       - uses: actions/setup-node@v3
         with:
           node-version: 20
 
       - name: Build
         run: |
-          npm run prepare
           npm pack
           mv ringsnetwork-rings-node-*.tgz rings-${{ needs.gen_version.outputs.version }}-${{ steps.target.outputs.target }}.tgz
 
       - uses: actions/upload-artifact@v3
         name: Upload artifacts
         with:
-          path: rings-${{ needs.gen_version.outputs.version }}-${{ steps.target.outputs.target }}
-          name: rings-${{ needs.gen_version.outputs.version }}-${{ steps.target.outputs.target }}.tgz
+          name: rings-${{ needs.gen_version.outputs.version }}-${{ steps.target.outputs.target }}
+          path: rings-${{ needs.gen_version.outputs.version }}-${{ steps.target.outputs.target }}.tgz
           retention-days: 1
 
-
   release:
     needs: [gen_version, build_macos, build_linux, build_browser]
     runs-on: ubuntu-latest

diff --git a/.github/workflows/qaci.yml b/.github/workflows/qaci.yml
@@ -32,9 +32,9 @@ jobs:
           version: "0.2.84"
 
       # If you need to reset the cache version, increment the number after `v`
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: wasm-v1
+          shared-key: wasm-v1
 
       - name: Run clippy for core wasm
         run: cargo clippy -p rings-core --features wasm --no-deps --no-default-features --target=wasm32-unknown-unknown --tests -- -D warnings
@@ -71,9 +71,9 @@ jobs:
         run: rustup show
 
       # If you need to reset the cache version, increment the number after `v`
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: default-v1
+          shared-key: default-v1
 
       - name: Build
         run: cargo build --all --verbose
@@ -101,9 +101,9 @@ jobs:
           rustup show
 
       # If you need to reset the cache version, increment the number after `v`
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: static-v1
+          shared-key: static-v1
 
       - name: Run clippy
         run: cargo clippy --all --tests -- -D warnings

diff --git a/Makefile b/Makefile
@@ -10,9 +10,6 @@ fmt:
 clippy-fix:
 	cargo clippy --fix --allow-dirty --no-deps
 
-build-browser-pack:
-	wasm-pack build node --scope ringsnetwork -t web --no-default-features --features browser --features console_error_panic_hook
-
 test-core-wasm:
 	cd core; wasm-pack test --chrome --features browser_chrome_test --no-default-features
 

diff --git a/package.json b/package.json
@@ -11,7 +11,8 @@
     "url": "https://github.com/RingsNetwork/rings-node"
   },
   "scripts": {
-    "prepare": "make build-browser-pack && cp node/pkg/rings_node* ./"
+    "wasm_pack": "wasm-pack build node --scope ringsnetwork -t web --no-default-features --features browser --features console_error_panic_hook",
+    "prepare": "npm run wasm_pack && cp node/pkg/rings_node* ./"
   },
   "files": [
     "rings_node_bg.wasm",