Skip to content

Commit

Permalink
Update .gitlab-ci.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
torproject-sync committed Aug 16, 2017
1 parent 859de8b commit 7346c93
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]: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 [email protected]:hiro/tor.git
- "cd tor"
- git remote add upstream https://git.torproject.org/tor.git
- git checkout master
- git config --global user.email "[email protected]"
- git config --global user.name "gitadmin"
- git pull -Xtheirs upstream master
Expand Down

0 comments on commit 7346c93

Please sign in to comment.