diff options
| author | Andreas Schneider <asn@samba.org> | 2019-08-08 08:18:55 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-08-10 19:24:29 +0000 |
| commit | 5eb4d705396faa5e5de90aaa86f7115b0f005589 (patch) | |
| tree | c4bd69516a497a19df5ab0e48e8d66486ef6dd52 /.gitlab-ci.yml | |
| parent | b81cb04d03d57b8175d862ba48ac476fedf23636 (diff) | |
| download | samba-5eb4d705396faa5e5de90aaa86f7115b0f005589.tar.gz | |
gitlab-ci: Install compat-gnutls34 on CentOS7
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 313ae01fa69..734d5152c00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 339a70ba1881feec94109c5c4eafacf4ff6c43bc + SAMBA_CI_CONTAINER_TAG: e4c3da88c459ae1a97c1c5e41f52b17d688d295f # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -268,6 +268,8 @@ centos7-samba-o3: variables: # Git on CentOS doesn't support shallow git cloning GIT_DEPTH: "" + # We need a newer GnuTLS version on CentOS7 + PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig" fedora29-samba-o3: extends: .samba-o3-template |