From f01400d407bb2e135117af39a878476cd9ba6f71 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 11 Dec 2017 15:15:26 -0500
Subject: [PATCH] check_submodules.sh force update if in CI

---
 Tools/check_submodules.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh
index 2b0e75971d..19ee52c071 100755
--- a/Tools/check_submodules.sh
+++ b/Tools/check_submodules.sh
@@ -3,7 +3,7 @@
 function check_git_submodule {
 
 # The .git exists in a submodule if init and update have been done.
-if [ -f $1"/.git" ] || [ -d $1"/.git" ];
+if [ "$CI" != "true" ] && [[ -f $1"/.git" || -d $1"/.git" ]];
 then
 	SUBMODULE_STATUS=$(git submodule summary "$1")
 	STATUSRETVAL=$(echo $SUBMODULE_STATUS | grep -A20 -i "$1")
@@ -45,8 +45,8 @@ then
 	fi
 else
 	git submodule sync --recursive -- $1
-	git submodule update --init --recursive -- $1  || true
-	git submodule update --init --recursive -- $1
+	git submodule update --init --recursive --force -- $1  || true
+	git submodule update --init --recursive --force -- $1
 fi
 
 }