Merge branch 'bugfix/ci_submodule_checkout_v3.3' into 'release/v3.3'

igrr · igrr · commit 367c3c09ccd1 · 2020-01-15T10:25:28.000+08:00
ci: Clean submodules after fetching sources

See merge request espressif/esp-idf!7321
diff --git a/tools/ci/get-full-sources.sh b/tools/ci/get-full-sources.sh
@@ -41,6 +41,8 @@ update_submodules() {
     else
         ${SCRIPT_DIR}/mirror-submodule-update.sh || return $?
     fi
+    # possibility that there are some untracked files left in submodule working directories
+    git submodule foreach --recursive git clean -ffdx
 }
 
 del_files() {

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ update_submodules() {`
`41`	`41`	`else`
`42`	`42`	`${SCRIPT_DIR}/mirror-submodule-update.sh \|\| return $?`
`43`	`43`	`fi`
	`44`	`+ # possibility that there are some untracked files left in submodule working directories`
	`45`	`+ git submodule foreach --recursive git clean -ffdx`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`del_files() {`