aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorhiromipaw <hiro@torproject.org>2017-09-01 18:54:37 +0200
committerhiromipaw <hiro@torproject.org>2017-09-01 18:54:37 +0200
commit1e654d1b9d0f6791fbd7969d7f4fc3c06ee264b7 (patch)
tree358e37a09110430ddfbe95ecd71cc6662bbd3aff /.gitlab-ci.yml
parent1ec29a1bec6392339db92b86c450c66bfca74f14 (diff)
downloadtor-1e654d1b9d0f6791fbd7969d7f4fc3c06ee264b7.tar.gz
tor-1e654d1b9d0f6791fbd7969d7f4fc3c06ee264b7.zip
Fix yml and improve ci flow
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml11
1 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69e6656f4d..d2634b4b8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,9 @@
-build:
- script:
+before_script:
- "apt-get update -qq"
- "apt-get upgrade -y"
+
+build:
+ script:
- "apt-get install -y --fix-missing git openssh-client asciidoc wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev"
- "sh autogen.sh && ./configure && make"
- "make check"
@@ -9,8 +11,6 @@ build:
update:
script:
- - "apt-get update -qq"
- - "apt-get upgrade -y"
- "apt-get install -y --fix-missing git openssh-client"
-
# Run ssh-agent (inside the build environment)
@@ -31,8 +31,9 @@ update:
- mkdir -p ~/.ssh
- '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts'
- echo "merging from torgit"
- - git clone --bare https://git.torproject.org/tor.git
- "cd tor"
+ - "mkdir tor"
+ - git clone --bare https://git.torproject.org/tor.git
- git checkout master
- git config --global user.email "labadmin@oniongit.eu"
- git config --global user.name "gitadmin"