Merge branch 'master' of github.com:mpusz/units

This commit is contained in:
Mateusz Pusz
2020-12-17 23:06:57 +01:00
2 changed files with 4 additions and 2 deletions

View File

@@ -55,7 +55,7 @@ jobs:
CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD }} CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD }}
CONAN_UPLOAD: ${{ secrets.CONAN_UPLOAD }} CONAN_UPLOAD: ${{ secrets.CONAN_UPLOAD }}
CONAN_OPTIONS: mp-units:build_docs=False 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 }} CONAN_DOCKER_IMAGE: conanio/${{ matrix.compiler.name }}${{ matrix.compiler.version }}
run: | run: |
export CONAN_`echo ${{ matrix.compiler.name }} | tr [:lower:] [:upper:]`_VERSIONS="${{ matrix.compiler.version }}" export CONAN_`echo ${{ matrix.compiler.name }} | tr [:lower:] [:upper:]`_VERSIONS="${{ matrix.compiler.version }}"

View File

@@ -25,11 +25,13 @@ name: Documentation
on: on:
push: push:
paths: paths:
- '.github/workflows/documentation.yml'
- 'docs/**' - 'docs/**'
- 'src/**' - 'src/**'
- 'example/**' - 'example/**'
pull_request: pull_request:
paths: paths:
- '.github/workflows/documentation.yml'
- 'docs/**' - 'docs/**'
- 'src/**' - 'src/**'
- 'example/**' - 'example/**'
@@ -76,7 +78,7 @@ jobs:
- name: Configure CMake - name: Configure CMake
run: | run: |
cd build cd build
cmake .. -G "Ninja Multi-Config" cmake .. -G Ninja
- name: Generate documentation - name: Generate documentation
run: | run: |
cd build cd build