diff options
| author | Hiro <me@hiro7.eu> | 2017-08-16 16:52:16 +0000 |
|---|---|---|
| committer | Hiro <me@hiro7.eu> | 2017-08-16 16:52:16 +0000 |
| commit | 7346c93822d78e6bec3600f0aedaccd0232a0625 (patch) | |
| tree | 2e206dc95a2773676bfe46b388362ed9582b95d3 /.gitlab-ci.yml | |
| parent | 859de8bfeb3774802317df016f254d922e5037ed (diff) | |
| download | tor-7346c93822d78e6bec3600f0aedaccd0232a0625.tar.gz tor-7346c93822d78e6bec3600f0aedaccd0232a0625.zip | |
Update .gitlab-ci.yml
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 388563418c..b6e1bf48bf 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 |