From ef03aa3f8ece80c8a7539c131efc4359eccf018c Mon Sep 17 00:00:00 2001 From: hiromipaw Date: Fri, 1 Sep 2017 18:12:30 +0200 Subject: Modify gitlab-ci for mirroring --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45e3052e40..ef28471549 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,11 +30,9 @@ build: update: script: - echo "merging from torgit" - - git clone git@oniongit.eu:hiro/tor.git - - "cd tor" - - git remote add upstream https://git.torproject.org/tor.git + - git clone --bare https://git.torproject.org/tor.git + - "cd tor" - git checkout master - git config --global user.email "labadmin@oniongit.eu" - git config --global user.name "gitadmin" - - git pull -Xtheirs upstream master - - git push origin master + - git push --mirror git@oniongit.eu:hiro/tor.git -- cgit v1.2.3-54-g00ecf