Merge pull request #5995 from libgit2/ethomson/centos_ci ci: update centos builds
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c1abdc8..e235a3c 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -112,15 +112,17 @@ jobs:
name: centos7
env:
CMAKE_OPTIONS: -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
+ PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
SKIP_NEGOTIATE_TESTS: true
- BUILD_PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
os: ubuntu-latest
- # CentOS 8
container:
name: centos8
env:
CMAKE_OPTIONS: -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
+ PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
SKIP_NEGOTIATE_TESTS: true
+ SKIP_SSH_TESTS: true
os: ubuntu-latest
- # macOS
os: macos-10.15
diff --git a/ci/docker/centos8 b/ci/docker/centos8
index bda4ee7..e1fb768 100644
--- a/ci/docker/centos8
+++ b/ci/docker/centos8
@@ -44,3 +44,5 @@ RUN useradd --shell /bin/bash libgit2 --create-home
FROM adduser AS configure
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
RUN mkdir /var/run/sshd
+RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local && \
+ ldconfig