diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 371a6f2..2e678ad 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -22,7 +22,6 @@ jobs: mkdir /tmp/osp-builder-docker cat <<'EOF' >/tmp/osp-builder-docker/Dockerfile FROM conanio/gcc${{ matrix.compiler_version }}-ubuntu16.04 - RUN apt-get update && apt-get install -y --force-yes doxygen ENV CONAN_LOGIN_USERNAME_OSP=${{ secrets.osp_artifactory_usr }} ENV CONAN_PASSWORD_OSP=${{ secrets.osp_artifactory_pwd }} COPY entrypoint.sh / @@ -79,7 +78,6 @@ jobs: run: | pip3 install --upgrade setuptools pip pip3 install conan - choco install doxygen.install - name: Configure Conan run: | conan profile detect diff --git a/conanfile.py b/conanfile.py index 6287cbe..4d292a8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -40,7 +40,10 @@ def configure(self): self.options["*"].shared = self.options.shared # Dependencies/requirements - tool_requires = "cmake/[>=3.15]" + tool_requires = ( + "cmake/[>=3.15]", + "doxygen/[>=1.8]", + ) requires = ( "boost/[>=1.71.0]", "libcosim/0.11.0@osp/testing-feature_conan-2",