Skip to content

Commit 6ed7599

Browse files
vgvassilevsftnight
authored andcommitted
Reimplement the sync procedure.
1 parent cb658dd commit 6ed7599

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

.travis.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -245,20 +245,25 @@ before_script:
245245
if [ -n "$NIGHTLY_CRON_SYNC" ] && [ "$TRAVIS_EVENT_TYPE" = "cron" ] \
246246
&& [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] \
247247
&& [ "$TRAVIS_REPO_SLUG" == "vgvassilev/cling" ] ; then
248-
# Workaround for travis issue: travis-ci/travis-ci#6069
249-
git remote set-branches --add origin master
250-
git pull origin master
248+
# Override the default travis clone command to enable sync.
249+
cd ../../ && rm -fr ${TRAVIS_REPO_SLUG}
250+
git clone https://[email protected]/${TRAVIS_REPO_SLUG} ${TRAVIS_REPO_SLUG}
251+
cd ${TRAVIS_REPO_SLUG}
252+
git checkout -qf ${TRAVIS_COMMIT}
251253
252254
echo "Syncing repository."
253255
git remote add alt http://root.cern.ch/git/cling.git
254256
git pull alt master
255-
git remote remove origin
256-
git remote add origin https://[email protected]/${TRAVIS_REPO_SLUG}
257-
git push --verbose origin HEAD
258257
259258
# Move the tag to newest master
260-
git tag --force cling-nightlies HEAD
259+
git tag --force cling-nightlies master
260+
261+
# Push to origin
262+
git push --verbose origin master
261263
git push --verbose --force origin cling-nightlies
264+
265+
# Some debug output.
266+
git remote -v && git branch -a
262267
fi
263268
264269
script:

0 commit comments

Comments
 (0)