diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-07-17 22:01:27 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-07-17 22:50:47 +0200 |
| commit | f2d65e18c326f26a2dffb256cfaed7c4baeb752c (patch) | |
| tree | 9e98f887f8cf4f7cd254d689b3591b20eab75f6c | |
| parent | 65b36a8584723b316957cda6c0c7641a975e7d5f (diff) | |
| download | gnutls-tmp-3.5.x-f28.tar.gz | |
.gitlab-ci.yml: move to f28 imagestmp-3.5.x-f28
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rw-r--r-- | Makefile.am | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e453ed873..5c06d8b370 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,8 @@ stages: variables: BUILD_IMAGES_PROJECT: gnutls/build-images DEBIAN_BUILD: buildenv-debian - FEDORA_BUILD: buildenv-f26 - FEDORA_X86_BUILD: buildenv-f26-x86 + FEDORA_BUILD: buildenv-f28 + FEDORA_X86_BUILD: buildenv-f28-x86 GET_SOURCES_ATTEMPTS: "3" ################################################## @@ -39,7 +39,7 @@ abi-coverage/Fedora: script: - git submodule update --init --no-fetch - make autoreconf - - CFLAGS="-std=c99 -O2 -g" ./configure --prefix=/usr --libdir=/usr/lib64 --disable-cxx --enable-code-coverage --disable-non-suiteb-curves --disable-maintainer-mode --disable-doc + - CFLAGS="-g -Og" ./configure --prefix=/usr --libdir=/usr/lib64 --disable-cxx --enable-code-coverage --disable-non-suiteb-curves --disable-maintainer-mode --disable-doc && make -j$(nproc) - make abi-check - make pic-check @@ -58,6 +58,7 @@ abi-coverage/Fedora: - ./*.log - ./tests/*/*.log - ./tests/suite/*/*.log + - ./compat_reports/* minimal/Fedora/x86_64: stage: stage1-testing @@ -149,8 +150,7 @@ no-openpgp/Fedora/x86_64: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: - make autoreconf - - mkdir -p build && cd build && - ../configure --disable-openpgp-authentication --disable-doc --disable-guile --disable-full-test-suite + - CFLAGS="-g -Og" ./configure --disable-openpgp-authentication --disable-doc --disable-guile --disable-full-test-suite - make -j$(nproc) - make abi-check - make check -j$(nproc) @@ -161,10 +161,10 @@ no-openpgp/Fedora/x86_64: artifacts: when: on_failure paths: - - build/guile/tests/*.log - - build/tests/*.log - - build/tests/*/*.log - - build/compat_reports/* + - ./guile/tests/*.log + - ./tests/*.log + - ./tests/*/*.log + - ./compat_reports/* valgrind/Fedora/x86_64: stage: stage1-testing diff --git a/Makefile.am b/Makefile.am index 85d67faf80..a14003c0fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,9 +77,9 @@ ABIVERCMD="git for-each-ref --sort=taggerdate --format '%(refname)' refs/tags|gr git fetch --tags https://gitlab.com/gnutls/gnutls.git && \ git checkout $$(eval $(ABIREFCMD)) && \ $(MAKE) autoreconf && if test -f ../cache/config.cache;then \ - CFLAGS="-g -Og" ./configure --disable-doc --cache-file ../cache/config.cache;\ + CFLAGS="-g -Og" ./configure --disable-cxx --disable-doc --cache-file ../cache/config.cache;\ else\ - CFLAGS="-g -Og" ./configure --disable-doc;\ + CFLAGS="-g -Og" ./configure --disable-cxx --disable-doc;\ fi && $(MAKE) -j$$(nproc) -C gl && $(MAKE) -j$$(nproc) -C lib && $(MAKE) -j$$(nproc) -C libdane touch $@ |