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