diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a18fb6984..0bb06921d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,7 +125,6 @@ jobs: # build with conan package manager - repos: r3broot-conan - # The R3BFileSource repo is used for testing unpacking. preset: default # Jobs are run inside a Docker container, which provides different compiled diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 5c6a78322..965fac36c 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -26,13 +26,16 @@ jobs: clang-tidy: runs-on: ubuntu-latest + strategy: + matrix: + preset: [ default ] container: image: yanzhaowang/cvmfs_clang:latest volumes: - /tmp:/cvmfs env: CVMDIR: /cvmfs/fairsoft.gsi.de - options: --user root --privileged --ulimit nofile=10000:10000 --cap-add SYS_ADMIN --device /dev/fuse + options: --user root --privileged --ulimit nofile=9999:10000 --cap-add SYS_ADMIN --device /dev/fuse steps: - uses: actions/checkout@v4 with: diff --git a/conanfile.py b/conanfile.py index d4e8fbc82..953d8ec4d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -11,6 +11,9 @@ def requirements(self): self.requires("range-v3/0.12.0") self.requires("gtest/cci.20210126") self.requires("nlohmann_json/3.11.2") + self.requires("yaml-cpp/0.8.0") + self.requires("protobuf/5.27.0") + self.requires("gsl/2.7.1") def generate(self): tc = CMakeToolchain(self)