diff options
| author | Hiro <me@hiro7.eu> | 2017-08-16 16:56:21 +0000 |
|---|---|---|
| committer | Hiro <me@hiro7.eu> | 2017-08-16 16:56:21 +0000 |
| commit | dcda597fd3ec89ba0c339ba7f01abf0ec27e2783 (patch) | |
| tree | 957c5f1ed244c7f921c24b1d33304ba03ba8b74c /.gitlab-ci.yml | |
| parent | 15bc2b1a647030456f57cf4a5deebee516ef6efe (diff) | |
| download | tor-dcda597fd3ec89ba0c339ba7f01abf0ec27e2783.tar.gz tor-dcda597fd3ec89ba0c339ba7f01abf0ec27e2783.zip | |
Update .gitlab-ci.yml
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 10 insertions, 6 deletions
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 |