From 4c899e9c9e67b35bf6b032812f2df051ad5b0016 Mon Sep 17 00:00:00 2001 From: web3-developer <51288821+web3-developer@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:02:24 +0800 Subject: [PATCH 1/2] Bump nim-rocksdb. --- Makefile | 2 ++ vendor/nim-rocksdb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1406acb4a2..bd7efda359 100644 --- a/Makefile +++ b/Makefile @@ -193,9 +193,11 @@ NIM_PARAMS := $(NIM_PARAMS) $(NIM_ETH_PARAMS) #- deletes and recreates "nimbus.nims" which on Windows is a copy instead of a proper symlink update: | update-common + + vendor/nim-rocksdb/scripts/clean_build_artifacts.sh rm -rf nimbus.nims && \ $(MAKE) nimbus.nims $(HANDLE_OUTPUT) + update-from-ci: | sanity-checks update-test rm -rf nimbus.nims && \ $(MAKE) nimbus.nims $(HANDLE_OUTPUT) diff --git a/vendor/nim-rocksdb b/vendor/nim-rocksdb index a84cf5b896..e36f454cd4 160000 --- a/vendor/nim-rocksdb +++ b/vendor/nim-rocksdb @@ -1 +1 @@ -Subproject commit a84cf5b8960756acb9027a80ba2b1e7cd059e206 +Subproject commit e36f454cd4e3ed84f02952b5582327ef3a7a4f55 From 3fb0a305a87351fb0c870042539769a8ac26f446 Mon Sep 17 00:00:00 2001 From: web3-developer <51288821+web3-developer@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:09:30 +0800 Subject: [PATCH 2/2] Clean rocksdb on make update in case rocksdb has been updated. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bd7efda359..f41ec707e2 100644 --- a/Makefile +++ b/Makefile @@ -193,10 +193,9 @@ NIM_PARAMS := $(NIM_PARAMS) $(NIM_ETH_PARAMS) #- deletes and recreates "nimbus.nims" which on Windows is a copy instead of a proper symlink update: | update-common - + vendor/nim-rocksdb/scripts/clean_build_artifacts.sh rm -rf nimbus.nims && \ $(MAKE) nimbus.nims $(HANDLE_OUTPUT) - + + vendor/nim-rocksdb/scripts/clean_build_artifacts.sh update-from-ci: | sanity-checks update-test rm -rf nimbus.nims && \