diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 7d2d00ce..71776d99 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -55,7 +55,7 @@ jobs: CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD }} CONAN_UPLOAD: ${{ secrets.CONAN_UPLOAD }} CONAN_OPTIONS: mp-units:build_docs=False - CONAN_CMAKE_GENERATOR: Ninja Multi-Config + CONAN_CMAKE_GENERATOR: Ninja CONAN_DOCKER_IMAGE: conanio/${{ matrix.compiler.name }}${{ matrix.compiler.version }} run: | export CONAN_`echo ${{ matrix.compiler.name }} | tr [:lower:] [:upper:]`_VERSIONS="${{ matrix.compiler.version }}" diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 04fd8ed4..3054e2d3 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -25,11 +25,13 @@ name: Documentation on: push: paths: + - '.github/workflows/documentation.yml' - 'docs/**' - 'src/**' - 'example/**' pull_request: paths: + - '.github/workflows/documentation.yml' - 'docs/**' - 'src/**' - 'example/**' @@ -76,7 +78,7 @@ jobs: - name: Configure CMake run: | cd build - cmake .. -G "Ninja Multi-Config" + cmake .. -G Ninja - name: Generate documentation run: | cd build