From 8d88177a4c93e4e01a99285f438c33ca5a890e2e Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 25 Jul 2018 11:02:47 -0700 Subject: [PATCH] autobuild.sh: don't check for untracked files in submodules This is a somewhat temporary workaround for avoiding git status errors related to symlinked files in the DPDK submodule. The build pools will be fixed to not change symlinks to regular files when copying repositories between systems, but until then apply this fix so we can move forward with switching to DPDK 18.05 (which now has symlinked files in its repository). Signed-off-by: Jim Harris Change-Id: I8a6df76fb77a6f3ee3817bd975d198ae4cc3014a Reviewed-on: https://review.gerrithub.io/420444 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- autobuild.sh | 2 +- autopackage.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index f051c6180..cb555283f 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -73,7 +73,7 @@ timing_exit "$make_timing_label" # Check for generated files that are not listed in .gitignore timing_enter generated_files_check -if [ `git status --porcelain | wc -l` -ne 0 ]; then +if [ `git status --porcelain --ignore-submodules | wc -l` -ne 0 ]; then echo "Generated files missing from .gitignore:" git status --porcelain exit 1 diff --git a/autopackage.sh b/autopackage.sh index bc18182c4..cfb04877f 100755 --- a/autopackage.sh +++ b/autopackage.sh @@ -14,7 +14,7 @@ timing_enter autopackage $MAKE clean -if [ `git status --porcelain | wc -l` -ne 0 ]; then +if [ `git status --porcelain --ignore-submodules | wc -l` -ne 0 ]; then echo make clean left the following files: git status --porcelain exit 1