feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

ci: Setting of a docker image fixed

Browse Source
This commit is contained in:
Mateusz Pusz
2020-12-24 10:50:45 +01:00
parent 2f4e308ea8
commit e93d799403
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/ci-conan.yml vendored
View File

@@ -69,6 +69,7 @@ jobs:
# ${{ runner.os }}-build- # ${{ runner.os }}-build-
# ${{ runner.os }}- # ${{ runner.os }}-
- name: Install Ninja - name: Install Ninja
if: !matrix.config.docker_image
shell: bash shell: bash
run: | run: |
if [ $RUNNER_OS == 'Linux' ]; then if [ $RUNNER_OS == 'Linux' ]; then
@@ -87,6 +88,7 @@ jobs:
run: | run: |
pip install -U conan_package_tools pip install -U conan_package_tools
- name: Set Conan default profile - name: Set Conan default profile
if: !matrix.config.docker_image
shell: bash shell: bash
run: | run: |
conan profile new --detect default conan profile new --detect default
@@ -97,6 +99,7 @@ jobs:
fi fi
conan profile show default conan profile show default
- name: Run Conan Package Tools - name: Run Conan Package Tools
shell: bash
env: env:
CONAN_USERNAME: mpusz CONAN_USERNAME: mpusz
CONAN_OPTIONS: mp-units:build_docs=False CONAN_OPTIONS: mp-units:build_docs=False
@@ -108,6 +111,8 @@ jobs:
CC: ${{ matrix.config.compiler.cc }} CC: ${{ matrix.config.compiler.cc }}
CXX: ${{ matrix.config.compiler.cxx }} CXX: ${{ matrix.config.compiler.cxx }}
CONAN_${{ matrix.config.compiler.type }}_VERSIONS: ${{ matrix.config.compiler.version }} CONAN_${{ matrix.config.compiler.type }}_VERSIONS: ${{ matrix.config.compiler.version }}
CONAN_DOCKER_IMAGE: ${{ matrix.config.docker_image }}
run: | run: |
if [ ! -z "${{ matrix.config.docker_image }}" ]; then
export CONAN_DOCKER_IMAGE=${{ matrix.config.docker_image }}
fi
python build.py python build.py