From ec4221d4a6b8eef7a03f77ae09986c6c9927f9e0 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 5 Nov 2020 09:02:53 +0100 Subject: [PATCH] docs: Ninja installation removed + docs generation fixed --- .github/workflows/conan-ci.yml | 3 --- .github/workflows/documentation.yml | 13 +++++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/conan-ci.yml b/.github/workflows/conan-ci.yml index af0f1ead..b3ed35d4 100644 --- a/.github/workflows/conan-ci.yml +++ b/.github/workflows/conan-ci.yml @@ -41,9 +41,6 @@ jobs: name: ${{ matrix.compiler.name }} ${{ matrix.compiler.version }} steps: - uses: actions/checkout@v2 - - name: Install Ninja - run: | - sudo apt install ninja-build - name: Set up Python uses: actions/setup-python@v2 with: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 8b524018..3075f741 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -55,9 +55,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: '3.8' - - name: Install Ninja - run: | - sudo apt install ninja-build - name: Install Python dependencies run: | pip install -Ur docs/requirements.txt @@ -70,16 +67,16 @@ jobs: conan remote add upload ${{ secrets.CONAN_UPLOAD }} conan remote add linear-algebra https://api.bintray.com/conan/twonington/public-conan - name: Install Conan dependencies - env: - CONAN_CMAKE_GENERATOR: Ninja run: | mkdir build && cd build conan install .. -s compiler.cppstd=20 -s compiler.libcxx=libstdc++11 -e mp-units:CONAN_RUN_TESTS=True -b outdated -u + - name: Configure CMake + run: | + cd build + cmake .. - name: Generate documentation run: | - pwd - ls -al - cmake .. -G Ninja + cd build cmake --build . --target sphinx - name: Deploy documentation if: github.ref == 'refs/heads/master'