aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2018-06-27 11:58:55 +0200
committerAndreas Schneider <asn@cryptomilk.org>2018-06-27 12:01:51 +0200
commitc1db283c3991035a2c6b1ffef7b6bfe900bc3b96 (patch)
tree0dd49531ae333b5ee07193bec00a9372f2ad00ba
parent6c97122120b0cf1bd0691aa48493ccf828d88132 (diff)
downloadlibssh-c1db283c3991035a2c6b1ffef7b6bfe900bc3b96.tar.gz
libssh-c1db283c3991035a2c6b1ffef7b6bfe900bc3b96.tar.xz
libssh-c1db283c3991035a2c6b1ffef7b6bfe900bc3b96.zip
gitlab: Enable build with libgcrypt
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--.gitlab-ci.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11c4fb4f..c66695b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,12 +128,10 @@ freebsd/x86-64:
paths:
- build/
-## Disabled as the test suite hangs due to:
-## https://dev.gnupg.org/T3731
-.fedora/libgcrypt/x86-64:
+fedora/libgcrypt/x86-64:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - mkdir -p obj && cd obj && cmake -DWITH_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_GCRYPT=1
+ - mkdir -p obj && cd obj && cmake -DWITH_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_GCRYPT=ON
-DWITH_CLIENT_TESTING=ON -DWITH_SSH1=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
-DWITH_PCAP=ON .. && make -j$(nproc) && ctest --output-on-failure
tags: