From c454878e0d0f73437d2bc82fac70191258b4680b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 21 Nov 2022 17:23:32 +0100 Subject: [PATCH] ci: improve clean-git by reseting submodules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoids a situation in which `variables.mk` from `nimbus-build-system` does't exist, but at the same time `git submodule update` doesn't work due to sumodules stuck in a bad state. Signed-off-by: Jakub SokoĊ‚owski --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c354a99ad5..8304793c62 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,8 @@ BUILD_SYSTEM_DIR := vendor/nimbus-build-system run-windows \ status-go \ status-keycard-go \ - statusq-sanity-checker \ - run-statusq-sanity-checker \ + statusq-sanity-checker \ + run-statusq-sanity-checker \ update ifeq ($(NIM_PARAMS),) @@ -612,8 +612,9 @@ clean: | clean-common + $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean clean-git: - git clean -fdx - git submodule foreach --recursive git clean -fdx + git clean -qfdx + git submodule foreach --recursive git reset -q --hard + git submodule foreach --recursive git clean -qfdx force-rebuild-status-go: bash ./scripts/force-rebuild-status-go.sh $(STATUSGO)