diff options
| author | Daiki Ueno <ueno@gnu.org> | 2019-09-16 11:17:41 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2019-09-16 11:17:41 +0000 |
| commit | 7e5d82c42ccf8e579cedcc85c61a866af6dfd0ca (patch) | |
| tree | 50774169c32e146ee3e8f1c5464f62ba8d07fe59 /.gitlab-ci.yml | |
| parent | b9c965ecbcfe873b09cd4c854119c5d6dcb0a462 (diff) | |
| parent | 8aa729ecc9cce85cf9cb3ce8f8f4f8b5fa271277 (diff) | |
| download | gnutls-7e5d82c42ccf8e579cedcc85c61a866af6dfd0ca.tar.gz | |
Merge branch 'wip-guile-include-m4-macros' into 'master'
maint: Include Guile's M4 macros.
See merge request gnutls/gnutls!1061
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6126a8e808..a03fdeca8d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: # name to allow expiration of old caches. cache: - key: "$CI_JOB_NAME-ver9" + key: "$CI_JOB_NAME-ver10" paths: - cache/ @@ -63,6 +63,10 @@ doc-dist.Fedora: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: - SUBMODULE_NOFETCH=1 ./bootstrap + - GUILE=/usr/bin/guile2.2 + - GUILD=/usr/bin/guild2.2 + - guile_snarf=/usr/bin/guile-snarf2.2 + - export GUILE GUILD guile_snarf - CFLAGS="-std=c99 -O2 -g" dash ./configure --disable-gcc-warnings --cache-file cache/config.cache --prefix=/usr --libdir=/usr/lib64 --disable-cxx --disable-non-suiteb-curves --enable-gtk-doc --disable-maintainer-mode - make -C doc stamp-vti && make -C doc stamp-1 && make -C doc stamp_enums && make -j$(nproc) - make -C doc gnutls.html @@ -80,6 +84,10 @@ abi/coverage: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: - SUBMODULE_NOFETCH=1 ./bootstrap + - GUILE=/usr/bin/guile2.2 + - GUILD=/usr/bin/guild2.2 + - guile_snarf=/usr/bin/guile-snarf2.2 + - export GUILE GUILD guile_snarf - CFLAGS="-g -Og" dash ./configure --disable-gcc-warnings --cache-file cache/config.cache --prefix=/usr --libdir=/usr/lib64 --enable-code-coverage --disable-maintainer-mode --disable-doc - make -j$(nproc) - make abi-check @@ -124,6 +132,7 @@ minimal.Fedora.x86_64: --disable-ssl3-support --disable-ssl2-support --disable-doc --enable-openssl-compatibility --disable-gcc-warnings --with-system-priority-file="" --disable-gost + --disable-guile - make clean - make -j$(nproc) tags: |