[tor-commits] [tor/master] Update .gitlab-ci.yml

[nickm@xxxxxxxxxxxxxx]

commit dcda597fd3ec89ba0c339ba7f01abf0ec27e2783
Author: Hiro <me@xxxxxxxx>
Date:   Wed Aug 16 16:56:21 2017 +0000

    Update .gitlab-ci.yml
---
 .gitlab-ci.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 335f1eeef..eda48c5f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,11 +23,15 @@ before_script:
   # instead.
   - mkdir -p ~/.ssh
   - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts'
-test:
+  
+build:
   script:
     - "sh autogen.sh && ./configure && make && make install"
+    
+test:
+  script:
     - "make test-full-online"
-  
+
 update:
   script: 
     - echo "merging from torgit"
@@ -35,7 +39,7 @@ update:
     - "cd tor"
     - git remote add upstream https://git.torproject.org/tor.git
     - git checkout master
-   - git config --global user.email "labadmin@xxxxxxxxxxx"
-   - git config --global user.name "gitadmin"
-   - git pull -Xtheirs upstream master
-   - git push origin master
+    - git config --global user.email "labadmin@xxxxxxxxxxx"
+    - git config --global user.name "gitadmin"
+    - git pull -Xtheirs upstream master
+    - git push origin master



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits