sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update .gitlab-ci.yml

This commit is contained in:
Hiro 2017-08-16 16:56:21 +00:00
parent 15bc2b1a64
commit dcda597fd3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci.yml
View File

@ -23,11 +23,15 @@ before_script:
# instead. # instead.
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
- '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts'
test:
build:
script: script:
- "sh autogen.sh && ./configure && make && make install" - "sh autogen.sh && ./configure && make && make install"
test:
script:
- "make test-full-online" - "make test-full-online"
update: update:
script: script:
- echo "merging from torgit" - echo "merging from torgit"
@ -35,7 +39,7 @@ update:
- "cd tor" - "cd tor"
- git remote add upstream https://git.torproject.org/tor.git - git remote add upstream https://git.torproject.org/tor.git
- git checkout master - git checkout master
- git config --global user.email "labadmin@oniongit.eu" - git config --global user.email "labadmin@oniongit.eu"
- git config --global user.name "gitadmin" - git config --global user.name "gitadmin"
- git pull -Xtheirs upstream master - git pull -Xtheirs upstream master
- git push origin master - git push origin master