diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-12-08 11:41:26 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-12-08 11:41:26 +0100 |
| commit | 00d1027b999990b29bc23920ca4fb958d84b8631 (patch) | |
| tree | cb8c99939758c63569074db308de75d31a270298 | |
| parent | 9d5ae752f5e5508cf6774f1c5c8a330d0297ba4b (diff) | |
| download | gnutls-tmp-stages-new.tar.gz | |
.gitlab-ci.yml: combined the no-unistring build with the minimal buildtmp-stages-new
| -rw-r--r-- | .gitlab-ci.yml | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b04fbd4ae5..c69399ff3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,11 +15,12 @@ Fedora/x86_64/minimal: stage: stage1-testing image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: - - make autoreconf && ./configure --with-included-libtasn1 + - dnf remove -y libunistring-devel libtasn1-devel && + make autoreconf && ./configure --with-included-libtasn1 --disable-doc --disable-dtls-srtp-support --disable-alpn-support --disable-rsa-export --disable-heartbeat-support --disable-srp-authentication --disable-psk-authentication --disable-anon-authentication --disable-dhe --disable-ecdhe --disable-openpgp-authentication - --disable-ocsp --disable-session-tickets --disable-non-suiteb-curves + --disable-ocsp --disable-session-tickets --disable-non-suiteb-curves --with-included-unistring --disable-nls --disable-crywrap --disable-libdane --without-p11-kit --without-tpm --disable-ssl3-support --disable-ssl2-support --without-zlib --disable-doc --disable-tests --enable-openssl-compatibility && make -j$(nproc) tags: @@ -27,26 +28,6 @@ Fedora/x86_64/minimal: except: - tags -# Check with no-unistring available -Fedora/x86_64/no-unistring: - stage: stage1-testing - image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD - script: - - dnf remove -y libunistring-devel && - make autoreconf && ./configure --disable-doc --with-included-unistring --disable-full-test-suite --disable-valgrind-tests --disable-non-suiteb-curves --disable-guile - && make -j$(nproc) && make check -j$(nproc) - tags: - - shared - except: - - tags - artifacts: - expire_in: 1 week - when: on_failure - paths: - - ./*.log - - tests/*.log - - tests/*/*.log - Fedora/x86_64/no-SSL-3.0: stage: stage1-testing image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD |