From 1eede3c6d9f8417f8d43604941a04f7340bcfd77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Bruus=20Zeppelin?= Date: Thu, 14 Sep 2023 12:20:39 +0200 Subject: [PATCH] Fix rust-cache --- .github/workflows/pipeline.yml | 6 ++++-- packages/common/package.json | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 0aae0c33b..c29ff4b04 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -96,7 +96,8 @@ jobs: with: workspaces: | packages/rust-bindings - deps/concordium-deps + deps/concordium-base/rust-src + deps/concordium-base/concordium-contracts-common - name: Get wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -336,7 +337,8 @@ jobs: with: workspaces: | packages/rust-bindings - deps/concordium-deps + deps/concordium-base/rust-src + deps/concordium-base/concordium-contracts-common - name: Run clippy run: cargo clippy --color=always --tests --benches -- -Dclippy::all diff --git a/packages/common/package.json b/packages/common/package.json index 833e885f9..d8971c088 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -68,8 +68,8 @@ "lint": "eslint . --cache --ext .ts,.tsx --max-warnings 0", "lint-fix": "yarn --silent lint --fix; exit 0", "test": "jest", - "build": "rm -rf src/grpc-api lib/cjs/grpc-api; mkdir -p src/grpc-api lib/cjs/grpc-api; yarn generate && yarn build-dev", - "build-dev": "yarn tsc-esm && yarn tsc-cjs && cp -R src/grpc-api lib/esm && yarn generate-ts-v2-cjs", + "build": "rm -rf src/grpc-api; mkdir -p src/grpc-api; yarn generate && yarn build-dev", + "build-dev": "yarn tsc-esm && yarn tsc-cjs && cp -R src/grpc-api lib/esm && rm -rf lib/cjs/grpc-api && mkdir -p lib/cjs/grpc-api && yarn generate-ts-v2-cjs", "tsc-esm": "tsc -p tsconfig.build.json", "tsc-cjs": "tsc -p tsconfig.build.json --outDir ./lib/cjs --module commonjs", "clean": "rimraf -- lib src/grpc-api"