From 252af3e779416c627158ba39b1df97cde51e5981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Wed, 20 May 2020 21:02:05 +0200 Subject: [PATCH] update-common: don't delete dotfiles --- makefiles/targets.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/targets.mk b/makefiles/targets.mk index 60952d1..00a620e 100644 --- a/makefiles/targets.mk +++ b/makefiles/targets.mk @@ -44,7 +44,7 @@ build-nim: | sanity-checks ARCH_OVERRIDE=$(ARCH_OVERRIDE) \ "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/build_nim.sh" "$(NIM_DIR)" ../Nim-csources ../nimble "$(CI_CACHE)" -#- for each submodule, delete checked out files (that might prevent a fresh checkout) +#- 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 #- initialises and updates the Git submodules #- hard-resets the working copies of submodules @@ -52,7 +52,7 @@ build-nim: | sanity-checks #- allows parallel building with the '+' prefix #- rebuilds the Nim compiler if the corresponding submodule is updated update-common: | sanity-checks - 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 # changing URLs in a submodule's submodule means we have to sync and update twice git submodule sync --quiet --recursive