Modify gitlab-ci for mirroring

ctkqiang · Sep 1, 2017 · ef03aa3 · ef03aa3
1 parent 40288fd
commit ef03aa3
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -30,11 +30,9 @@ build:
 update:
   script: 
     - echo "merging from torgit"
-    - git clone [email protected]: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 "[email protected]"
     - git config --global user.name "gitadmin"
-    - git pull -Xtheirs upstream master
-    - git push origin master
+    - git push --mirror [email protected]:hiro/tor.git