Skip to content

Commit

Permalink
fix(protogen): handle tmp dirs within protogen script (#172)
Browse files Browse the repository at this point in the history
Signed-off-by: Artur Troian <[email protected]>
  • Loading branch information
troian authored May 5, 2024
1 parent 6f2b7e8 commit 22e8a37
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 1 addition & 3 deletions make/setup-cache.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ $(AKASH_DEVCACHE):
mkdir -p $(AKASH_DEVCACHE_VERSIONS)
mkdir -p $(AKASH_DEVCACHE_NODE_MODULES)
mkdir -p $(AKASH_DEVCACHE)/run
mkdir -p $(AKASH_DEVCACHE_TS_TMP_GRPC_JS)
mkdir -p $(AKASH_DEVCACHE_TS_TMP_PATCHES)

cache: $(AKASH_DEVCACHE)

Expand Down Expand Up @@ -172,4 +170,4 @@ endif
$(AKASH_TS_NODE_MODULES): $(AKASH_TS_PACKAGE_FILE)
@echo "installing node modules..."
cd $(AKASH_TS_ROOT) && npm install
@echo "node modules installed."
@echo "node modules installed."
4 changes: 4 additions & 0 deletions script/protocgen-legacy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ function cleanup {
# put absolute path
rm -rf "${AKASH_ROOT}/github.com"
rm -rf "$AKASH_DEVCACHE_TS_TMP_GRPC_JS"
rm -rf "${AKASH_DEVCACHE_TS_TMP_PATCHES}"
}

trap cleanup EXIT ERR

mkdir -p "${AKASH_DEVCACHE_TS_TMP_GRPC_JS}"
mkdir -p "${AKASH_DEVCACHE_TS_TMP_PATCHES}"

script/ts-patches.sh preserve

ts_generated="${AKASH_TS_ROOT}/src/generated"
Expand Down

0 comments on commit 22e8a37

Please sign in to comment.