nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-23 20:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update .gitlab-ci.yml

Browse Source
This commit is contained in:
Hiro 2017-08-16 16:52:16 +00:00
parent 859de8bfeb
commit 7346c93822
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.gitlab-ci.yml
View File

@ -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