status-im
/
nimbus-build-system
mirror of https://github.com/status-im/nimbus-build-system.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update: check if any work might be lost (#28)

This commit is contained in:
Ștefan Talpalaru 2021-11-22 17:26:51 +01:00 committed by GitHub
parent 8d226580a0
commit 08000b4bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makefiles/targets.mk
View File

@ -11,6 +11,7 @@
warn-jobs \ warn-jobs \
deps-common \ deps-common \
build-nim \ build-nim \
update-test \
update-common \ update-common \
$(NIM_BINARY) \ $(NIM_BINARY) \
update-remote \ update-remote \
@ -80,6 +81,12 @@ build-nim: | sanity-checks
QUICK_AND_DIRTY_COMPILER=$(QUICK_AND_DIRTY_COMPILER) \ QUICK_AND_DIRTY_COMPILER=$(QUICK_AND_DIRTY_COMPILER) \
"$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/build_nim.sh" "$(NIM_DIR)" ../Nim-csources-v1 ../nimble "$(CI_CACHE)" "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/build_nim.sh" "$(NIM_DIR)" ../Nim-csources-v1 ../nimble "$(CI_CACHE)"
# Check if the update might cause loss of work. Abort, if so, while allowing an override mechanism.
update-test:
COMMAND="git status --short --untracked-files=no --ignore-submodules=untracked"; \
LINES=$$({ $${COMMAND} | grep . && echo ^---top level || true; git submodule foreach --recursive --quiet "$${COMMAND} | grep . && echo ^---\$$name || true"; } | tee /dev/tty | wc -l); \
if [[ "$${LINES}" -ne "0" && "$(OVERRIDE)" != "1" ]]; then echo -e "\nYou have uncommitted local changes which might be overwritten by the update. Aborting.\nIf you know better, you can re-run the command with OVERRIDE=1.\n"; exit 1; fi
#- for each submodule, delete checked out files (that might prevent a fresh checkout); skip dotfiles #- for each submodule, delete checked out files (that might prevent a fresh checkout); skip dotfiles
#- in case of submodule URL changes, propagates that change in the parent repo's .git directory #- in case of submodule URL changes, propagates that change in the parent repo's .git directory
#- initialises and updates the Git submodules #- initialises and updates the Git submodules
@ -89,7 +96,7 @@ build-nim: | sanity-checks
#- deletes the ".nimble" dir and executes the "deps" target #- deletes the ".nimble" dir and executes the "deps" target
#- allows parallel building with the '+' prefix #- allows parallel building with the '+' prefix
#- rebuilds the Nim compiler if the corresponding submodule is updated #- rebuilds the Nim compiler if the corresponding submodule is updated
update-common: | sanity-checks update-common: | sanity-checks update-test
git submodule foreach --quiet 'git ls-files --exclude-standard --recurse-submodules -z -- ":!:.*" | xargs -0 rm -rf' git submodule foreach --quiet 'git ls-files --exclude-standard --recurse-submodules -z -- ":!:.*" | xargs -0 rm -rf'
git submodule update --init --recursive || true git submodule update --init --recursive || true
# changing URLs in a submodule's submodule means we have to sync and update twice # changing URLs in a submodule's submodule means we have to sync and update twice