Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2019-12-09 11:34:15 +0000
committerSravan Kumar Lakkimsetti2019-12-09 11:34:15 +0000
commitc663a1b382f32894529d338cb792088c76d532e2 (patch)
tree80181438edd31f8f32c836ab819167204069718a /cje-production
parent58494359887132e40fe1d90f77a781b6ad013327 (diff)
downloadeclipse.platform.releng.aggregator-c663a1b382f32894529d338cb792088c76d532e2.tar.gz
eclipse.platform.releng.aggregator-c663a1b382f32894529d338cb792088c76d532e2.tar.xz
eclipse.platform.releng.aggregator-c663a1b382f32894529d338cb792088c76d532e2.zip
Bug 553757 - Migrate I-builds to new infra
Change-Id: Ie17b34b59a92f26fcdab861ec9cd0da8f0121005 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'cje-production')
-rwxr-xr-xcje-production/mbscripts/mb100_cloneRepos.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/cje-production/mbscripts/mb100_cloneRepos.sh b/cje-production/mbscripts/mb100_cloneRepos.sh
index c8e4fb607..ae1d6b367 100755
--- a/cje-production/mbscripts/mb100_cloneRepos.sh
+++ b/cje-production/mbscripts/mb100_cloneRepos.sh
@@ -23,9 +23,10 @@ source $CJE_ROOT/scripts/common-functions.shsource
source $1
git clone -b $BRANCH --recursive $GIT_ROOT$AGG_REPO ../$AGG_DIR
+git checkout $BRANCH
git pull
pushd ../$AGG_DIR
-git submodule foreach 'git fetch; SUBMODULE_BRANCH=$(grep $name: ../../../streams/repositories_$PATCH_OR_BRANCH_LABEL.txt | cut -f2 -d\ ); SUBMODULE_BRANCH=${SUBMODULE_BRANCH:-$BRANCH}; echo Checking out origin/$SUBMODULE_BRANCH; git checkout origin/$SUBMODULE_BRANCH; git pull'
+git submodule foreach 'git fetch; SUBMODULE_BRANCH=$(grep $name: ../../../streams/repositories_$PATCH_OR_BRANCH_LABEL.txt | cut -f2 -d\ ); SUBMODULE_BRANCH=${SUBMODULE_BRANCH:-$BRANCH}; echo Checking out $SUBMODULE_BRANCH; git checkout $SUBMODULE_BRANCH; git pull'
popd
pushd "../$AGG_DIR"
@@ -33,7 +34,8 @@ adds=$( git submodule | grep "^+" | cut -f2 -d" " )
if [ -z "$adds" ]; then
echo No updates for the submodules
return
+else
+ echo git add $adds
+ git add $adds
fi
-echo git add $adds
-git add $adds
popd

Back to the top