summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-09-07 16:54:24 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2018-05-26 06:36:11 +0200
commitdad818fc68e86bfd3fa901d7c26d802a1b16f3df (patch)
tree30dc8779d9257c59d81660fb571e0ffc774c3fcf
parent41d63488966ee917c466dde6404996c5c03ef2e0 (diff)
downloadgnutls-dad818fc68e86bfd3fa901d7c26d802a1b16f3df.tar.gz
.gitlab-ci.yml: removed initialization step
That is, combine syntax-check with the static analyzers run. That provides more parallelism per build and reduces the overall time spent on a successful run. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--.gitlab-ci.yml29
1 files changed, 4 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f7a8e83ba..18f59ac6bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
stages:
- - initialization
- stage1-testing
# we utilize the images generated by the build-images project, to
@@ -12,27 +11,6 @@ variables:
FEDORA_X86_BUILD: buildenv-f26-x86
GET_SOURCES_ATTEMPTS: "3"
-################
-# Initialization
-################
-
-init/Fedora/x86_64:
- stage: initialization
- image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
- script:
- - make autoreconf
- - ./configure --prefix=/usr --libdir=/usr/lib64 --disable-cxx --disable-non-suiteb-curves --disable-maintainer-mode --disable-guile
- - make syntax-check
- - make distclean
- tags:
- - shared
- artifacts:
- expire_in: 1 week
- when: on_failure
- paths:
- - ./*.log
-
-
##################################################
# Stage 1, documentation, and advanced checks
##################################################
@@ -236,9 +214,10 @@ static-analyzers/Fedora/x86_64:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- make autoreconf
- - ./configure --disable-doc --disable-guile --enable-fips140-mode
- - cppcheck --force -q -Ilib/include -Igl/ -Ilib/ -I. --error-exitcode=1 lib/ -i lib/unistring
- - cppcheck --force -q -Ilib/include -Igl/ -Ilibdane/ -I. --error-exitcode=1 libdane/
+ - scan-build ./configure --disable-doc --disable-guile --enable-fips140-mode --enable-valgrind-tests
+ - make -j$(nproc) syntax-check
+ - cppcheck --force -q -Ilib/include -Igl/ -Ilib/ -I. --error-exitcode=1 lib/ -i lib/unistring -i lib/minitasn1 -j$(nproc) $CPPCHECK_OPTIONS
+ - cppcheck --force -q -Ilib/include -Igl/ -Ilibdane/ -I. --error-exitcode=1 libdane/ -j$(nproc) $CPPCHECK_OPTIONS
tags:
- shared
except: