diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-07-04 11:25:27 +0000 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-07-04 11:25:27 +0000 |
| commit | 1edec08058e8678a9c1189789746aca506bd097a (patch) | |
| tree | 34ea0e647d35e046d3335e62f5bd8e45cfc4680b | |
| parent | 661f94641e590e0e7c4c65c5df7ae5e11b920d59 (diff) | |
| parent | 3aea96a1b6f7a4d343ee58aab2ea74783e17f2db (diff) | |
| download | gnutls-1edec08058e8678a9c1189789746aca506bd097a.tar.gz | |
Merge branch 'tmp-nettle-master' into 'master'
.gitlab-ci: disable config.cache for nettle-master builds
See merge request gnutls/gnutls!1291
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 628dd367b1..1c4160dcf2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -737,7 +737,7 @@ nettle-master.Fedora: - make -j$BUILDJOBS install - popd - SUBMODULE_NOFETCH=1 ./bootstrap - - PKG_CONFIG_PATH=$NETTLE_DIR/lib64/pkgconfig dash ./configure --cache-file cache/config.cache --disable-gcc-warnings --disable-doc --disable-guile + - PKG_CONFIG_PATH=$NETTLE_DIR/lib64/pkgconfig dash ./configure --disable-gcc-warnings --disable-doc --disable-guile - make -j$BUILDJOBS - PKG_CONFIG_PATH=$NETTLE_DIR/lib64/pkgconfig LD_LIBRARY_PATH=$NETTLE_DIR/lib64 make -j$CHECKJOBS check tags: @@ -769,7 +769,7 @@ nettle-master-minigmp.Fedora: - make -j$BUILDJOBS install - popd - SUBMODULE_NOFETCH=1 ./bootstrap - - PKG_CONFIG_PATH=$NETTLE_DIR/lib64/pkgconfig dash ./configure --cache-file cache/config.cache --disable-gcc-warnings --disable-doc --disable-guile --disable-full-test-suite + - PKG_CONFIG_PATH=$NETTLE_DIR/lib64/pkgconfig dash ./configure --disable-gcc-warnings --disable-doc --disable-guile --disable-full-test-suite - make -j$BUILDJOBS - PKG_CONFIG_PATH=$NETTLE_DIR/lib64/pkgconfig LD_LIBRARY_PATH=$NETTLE_DIR/lib64 make -j$CHECKJOBS check tags: |