summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2015-10-15 21:28:44 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2015-10-15 21:28:44 +0200
commit1f03036109c77e54cca8d1385148b960d20764f7 (patch)
treedd14f7a353f9a54fcf01b6fbfed84d0f3361ae03
parent0f1f516cfb3c1be5065cb3a44cd8622778524eb4 (diff)
downloadgnutls-1f03036109c77e54cca8d1385148b960d20764f7.tar.gz
backport: .gitlab-ci.yml: combined the slow build with the separate build dir
-rw-r--r--.gitlab-ci.yml17
1 files changed, 4 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0a9285ff9..332abe8f88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,3 @@
-Build with separate build dir:
- script:
- - git submodule update --init && make autoreconf && mkdir -p build && cd build &&
- ../configure --with-included-libtasn1 --disable-doc --disable-valgrind-tests &&
- make -j2 && make check -j3
- - cat tests/test-suite.log
- tags:
- - fast
- except:
- - tags
Build minimal:
script:
- git submodule update --init && make autoreconf && ./configure --with-included-libtasn1
@@ -40,10 +30,11 @@ Build and Check with asan:
- fast
except:
- tags
-Build and Check:
+Build and Check with separate build dir:
script:
- - git submodule update --init && make autoreconf && ./configure --with-included-libtasn1
- --disable-doc --disable-valgrind-tests && make -j2 && make check -j3
+ - git submodule update --init && make autoreconf && mkdir -p build && cd build &&
+ ../configure --with-included-libtasn1 --disable-doc --disable-valgrind-tests &&
+ make -j4 && make check -j4
- cat tests/test-suite.log
tags:
- slow