Browse Source

Modify gitlab-ci for mirroring

hiromipaw 6 years ago
parent
commit
ef03aa3f8e
1 changed files with 3 additions and 5 deletions
  1. 3 5
      .gitlab-ci.yml

+ 3 - 5
.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