diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-10 14:09:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-10 14:09:49 -0400 |
| commit | 22139c0b285e32639b35d671bef12277d3441791 (patch) | |
| tree | fdc5e47d9a7c5ba46449e06dccdeaddccfe92e63 | |
| parent | d9321d697d8ac01284a07ac9651bbfa4030f96e6 (diff) | |
| parent | 3ae5b32aaa291da6cdcfa7ccb19fdc830bc956d1 (diff) | |
| download | tor-22139c0b285e32639b35d671bef12277d3441791.tar.gz tor-22139c0b285e32639b35d671bef12277d3441791.zip | |
Merge remote-tracking branch 'catalyst-oniongit/bug23757'
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | changes/bug23757 | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 969646b987..ba981d5f14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,17 @@ before_script: - - "apt-get update -qq" - - "apt-get upgrade -y" + - apt-get update -qq + - apt-get upgrade -qy 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" - - "make install" + - apt-get install -qy --fix-missing automake build-essential + libevent-dev libssl-dev zlib1g-dev + libseccomp-dev liblzma-dev libscrypt-dev + - ./autogen.sh + - ./configure --disable-asciidoc --enable-fatal-warnings + --disable-silent-rules + - make check || (e=$?; cat test-suite.log; exit $e) + - make install update: only: diff --git a/changes/bug23757 b/changes/bug23757 new file mode 100644 index 0000000000..02507a0b4d --- /dev/null +++ b/changes/bug23757 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Adjust the GitLab CI configuration to more closely match that of Travis + CI. Fixes bug 23757; bugfix on 0.3.2.2-alpha. + |