ci: improve clean-git by reseting submodules

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 <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2022-11-21 17:23:32 +01:00
parent 1e6e138be7
commit c454878e0d
No known key found for this signature in database
GPG Key ID: BBD9AFEFDAF3339C
1 changed files with 5 additions and 4 deletions

View File

@ -37,8 +37,8 @@ BUILD_SYSTEM_DIR := vendor/nimbus-build-system
run-windows \ run-windows \
status-go \ status-go \
status-keycard-go \ status-keycard-go \
statusq-sanity-checker \ statusq-sanity-checker \
run-statusq-sanity-checker \ run-statusq-sanity-checker \
update update
ifeq ($(NIM_PARAMS),) ifeq ($(NIM_PARAMS),)
@ -612,8 +612,9 @@ clean: | clean-common
+ $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean + $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean
clean-git: clean-git:
git clean -fdx git clean -qfdx
git submodule foreach --recursive git clean -fdx git submodule foreach --recursive git reset -q --hard
git submodule foreach --recursive git clean -qfdx
force-rebuild-status-go: force-rebuild-status-go:
bash ./scripts/force-rebuild-status-go.sh $(STATUSGO) bash ./scripts/force-rebuild-status-go.sh $(STATUSGO)