diff options
| author | Stefan Metzmacher <metze@samba.org> | 2022-01-20 12:05:35 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2022-01-21 20:46:35 +0000 |
| commit | d0aa04e8c16192babfbafc7e9869e7ff98a731c9 (patch) | |
| tree | 56af1ec27b132af4f407a2a9ea27b2d7aa4b0ed7 /.gitlab-ci-main.yml | |
| parent | f60780c8b633ece61c952122aee4f313edb26010 (diff) | |
| download | samba-d0aa04e8c16192babfbafc7e9869e7ff98a731c9.tar.gz | |
bootstrap: use compat-gnutls37-devel for centos7
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to '.gitlab-ci-main.yml')
| -rw-r--r-- | .gitlab-ci-main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index c532069af52..dc46d4beaeb 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -42,7 +42,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 791e89a43f2b287635e128c8f5aed924b757c4bd + SAMBA_CI_CONTAINER_TAG: 44771060ac5c91a1feb9a85a7b722893b6f8d843 # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -592,7 +592,7 @@ centos7-samba-o3: # 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" + PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls37/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig" centos8-samba-o3: extends: .samba-o3-template |