commit 7346c93822d78e6bec3600f0aedaccd0232a0625 Author: Hiro me@hiro7.eu Date: Wed Aug 16 16:52:16 2017 +0000
Update .gitlab-ci.yml --- .gitlab-ci.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 388563418..b6e1bf48b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,14 +23,17 @@ before_script: # instead. - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - +test: + script: + - "sh autogen.sh && ./configure && make && make install" + 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 checkout master + 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 checkout master - git config --global user.email "labadmin@oniongit.eu" - git config --global user.name "gitadmin" - git pull -Xtheirs upstream master