summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2017-04-02 15:12:44 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2017-04-02 15:12:47 +0200
commit9f9ed4c259d5adf8872eecffc361f1faf2308182 (patch)
tree57050cc0ea71cfcd757a813ee5d8ecb09bababe7
parent6a849451d68f58641e2442a4d2ac49d7b14add8d (diff)
downloadgnutls-9f9ed4c259d5adf8872eecffc361f1faf2308182.tar.gz
.gitlab-ci.yml: combined minimal and no-tools builds
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r--.gitlab-ci.yml26
1 files changed, 5 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e82546542..86be515082 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,6 +81,11 @@ minimal/Fedora/x86_64:
stage: stage1-testing
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
+ - echo "No tools build"
+ - ./configure --disable-full-test-suite --disable-doc --disable-guile --disable-tools --enable-tests
+ - make -j$(nproc)
+ - make -j$(nproc) check
+ - echo "Minimal build"
- dnf remove -y libunistring-devel libtasn1-devel libidn-devel &&
./configure --with-included-libtasn1 --enable-valgrind-tests
--disable-doc --disable-dtls-srtp-support --disable-alpn-support --disable-rsa-export
@@ -205,27 +210,6 @@ valgrind/Fedora/x86_64:
- tests/*.log
- tests/*/*.log
-no-tools/Fedora/x86_64:
- stage: stage1-testing
- image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
- script:
- - ./configure --disable-full-test-suite --disable-doc --disable-guile --disable-tools --enable-tests
- - make -j$(nproc)
- - make -j$(nproc) check
- tags:
- - shared
- except:
- - tags
- dependencies:
- - init/Fedora/x86_64
- artifacts:
- expire_in: 1 week
- when: on_failure
- paths:
- - ./*.log
- - tests/*.log
- - tests/*/*.log
-
asan/Fedora/x86_64:
stage: stage1-testing
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD