diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-08-17 08:19:10 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2021-08-21 08:18:25 -0400 |
| commit | ecdb41f911783c3f21c88ed799efb38030336789 (patch) | |
| tree | 1f7f92e0e002ac638038de27f071b9962d7943c6 | |
| parent | 3f02b5b95e90d6be25aedf3f861e173182e815d7 (diff) | |
| download | libgit2-ethomson/centos_ci.tar.gz | |
ci: update centos to find libssh2ethomson/centos_ci
| -rw-r--r-- | .github/workflows/nightly.yml | 4 | ||||
| -rw-r--r-- | ci/docker/centos8 | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c1abdc8ef..e235a3ce7 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 bda4ee795..e1fb7684a 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 |