ci: fix

hirosystems · Jan 24, 2025 · 5933ce4 · 5933ce4
1 parent 3c4b8f4
commit 5933ce4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/ci-sdk.yaml b/.github/workflows/ci-sdk.yaml
@@ -39,15 +39,6 @@ jobs:
           echo "RUST_VERSION_HASH=$(rustc --version | sha256sum | awk '{print $1}')" >> $GITHUB_ENV
           echo "NODE_VERSION_HASH=$(node --version | sha256sum | awk '{print $1}')" >> $GITHUB_ENV
 
-      - name: Cache cargo
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/
-            ~/target/release/build/
-            ~/target/wasm32-unknown-unknown/build/
-          key: clarinet-sdk-cargo-${{ runner.os }}-${{ env.RUST_VERSION_HASH }}-${{ hashFiles('./Cargo.lock') }}
-
       # - name: Cache npm
       #   uses: actions/cache@v4
       #   with:
@@ -61,6 +52,12 @@ jobs:
       - name: Run wasm-bindgen-test
         run: wasm-pack test --node components/clarinet-sdk-wasm
 
+      - name: Cache cargo
+        uses: actions/cache@v4
+        with:
+          path: ~/target/wasm32-unknown-unknown/
+          key: clarinet-sdk-cargo-${{ runner.os }}-${{ env.RUST_VERSION_HASH }}-${{ hashFiles('./Cargo.lock') }}
+
       - name: Build Wasm packages
         run: npm run build:sdk-wasm
 
@@ -91,8 +88,6 @@ jobs:
         with:
           name: wasm-artifacts
           path: components/clarinet-sdk-wasm
-      - name: Display structure of downloaded files
-        run: ls -R components/clarinet-sdk-wasm
 
       - name: Install dependencies
         run: npm ci

diff --git a/components/clarinet-sdk/browser/package.json b/components/clarinet-sdk/browser/package.json
@@ -15,7 +15,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "compile": "tsc -b ./tsconfig.json",
-    "build": "npm run clean; npm run compile",
+    "build": "npm run clean && npm run compile",
     "prepare": "npm run build"
   },
   "keywords": [

diff --git a/components/clarinet-sdk/node/package.json b/components/clarinet-sdk/node/package.json
@@ -46,7 +46,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "compile": "tsc -b ./tsconfig.json ./tsconfig.cjs.json",
-    "build": "npm run clean; npm run compile; node ./scripts/prepare-esm-package.js",
+    "build": "npm run clean && npm run compile; node ./scripts/prepare-esm-package.js",
     "prepare": "npm run build",
     "pretest": "tsc -b ./tsconfig.json",
     "test": "vitest run"