Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcje-production/cleaners/cleanupNightlyRepo.sh8
-rwxr-xr-xcje-production/mbscripts/mb100_cloneRepos.sh16
2 files changed, 18 insertions, 6 deletions
diff --git a/cje-production/cleaners/cleanupNightlyRepo.sh b/cje-production/cleaners/cleanupNightlyRepo.sh
index f92f4ad45..94fb778ba 100755
--- a/cje-production/cleaners/cleanupNightlyRepo.sh
+++ b/cje-production/cleaners/cleanupNightlyRepo.sh
@@ -193,10 +193,10 @@ function cleanRepo ()
workspace=$1
remoteBase="/home/data/httpd/download.eclipse.org"
-eclipseIRepo="${remoteBase}/eclipse/updates/4.14-I-builds"
-eclipseSRepo="${remoteBase}/eclipse/updates/4.14milestones"
-eclipseYRepo="${remoteBase}/eclipse/updates/4.13-Y-builds"
-eclipsePRepo="${remoteBase}/eclipse/updates/4.13-P-builds"
+eclipseIRepo="${remoteBase}/eclipse/updates/4.15-I-builds"
+eclipseSRepo="${remoteBase}/eclipse/updates/4.15milestones"
+eclipseYRepo="${remoteBase}/eclipse/updates/4.15-Y-builds"
+eclipsePRepo="${remoteBase}/eclipse/updates/4.15-P-builds"
#doDryrun=dryrun
doDryrun=
diff --git a/cje-production/mbscripts/mb100_cloneRepos.sh b/cje-production/mbscripts/mb100_cloneRepos.sh
index 85ea1de6c..c8e4fb607 100755
--- a/cje-production/mbscripts/mb100_cloneRepos.sh
+++ b/cje-production/mbscripts/mb100_cloneRepos.sh
@@ -23,5 +23,17 @@ source $CJE_ROOT/scripts/common-functions.shsource
source $1
git clone -b $BRANCH --recursive $GIT_ROOT$AGG_REPO ../$AGG_DIR
-cd ../$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
+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'
+popd
+
+pushd "../$AGG_DIR"
+adds=$( git submodule | grep "^+" | cut -f2 -d" " )
+if [ -z "$adds" ]; then
+ echo No updates for the submodules
+ return
+fi
+echo git add $adds
+git add $adds
+popd

Back to the top