From dcda597fd3ec89ba0c339ba7f01abf0ec27e2783 Mon Sep 17 00:00:00 2001 From: Hiro Date: Wed, 16 Aug 2017 16:56:21 +0000 Subject: Update .gitlab-ci.yml --- .gitlab-ci.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 335f1eeeff..eda48c5f28 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@oniongit.eu" - - git config --global user.name "gitadmin" - - git pull -Xtheirs upstream master - - git push origin master + - git config --global user.email "labadmin@oniongit.eu" + - git config --global user.name "gitadmin" + - git pull -Xtheirs upstream master + - git push origin master -- cgit v1.2.3-54-g00ecf