mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-05 21:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: another effort to fix it

Browse Source
This commit is contained in:
Mateusz Pusz
2021-03-19 09:58:01 +01:00
parent 30532ca4e8
commit 2defd58899
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/ci-test-package-cmake.yml vendored
View File

@@ -34,9 +34,6 @@ on:
- 'example/**' - 'example/**'
- 'test/**' - 'test/**'
env:
CMAKE_GENERATOR: Ninja
jobs: jobs:
test_package: test_package:
name: ${{ matrix.config.name }} ${{ matrix.build_type }} name: ${{ matrix.config.name }} ${{ matrix.build_type }}
@@ -48,7 +45,7 @@ jobs:
- { - {
name: "Windows MSVC 2019", name: "Windows MSVC 2019",
os: windows-latest, os: windows-latest,
compiler: { type: VISUAL, version: 16, cc: "cl", cxx: "cl" } compiler: { type: VISUAL, version: 16, cc: "", cxx: "" }
} }
- { - {
name: "Ubuntu GCC 10.1.0", name: "Ubuntu GCC 10.1.0",
@@ -82,6 +79,12 @@ jobs:
# docker_image: conanio/gcc10 # docker_image: conanio/gcc10
# } # }
build_type: [ "Release", "Debug" ] build_type: [ "Release", "Debug" ]
env:
CC: ${{ matrix.config.compiler.cc }}
CXX: ${{ matrix.config.compiler.cxx }}
CMAKE_GENERATOR: Ninja
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Cache Conan data - name: Cache Conan data
@@ -131,10 +134,6 @@ jobs:
- name: Configure Conan - name: Configure Conan
shell: bash shell: bash
run: | run: |
if [[ "${{ matrix.config.compiler.type }}" == "GCC" || "${{ matrix.config.compiler.type }}" == "CLANG" ]]; then
export CC=${{ matrix.config.compiler.cc }}
export CXX=${{ matrix.config.compiler.cxx }}
fi
conan config init conan config init
conan remote add upload https://api.bintray.com/conan/mpusz/conan-mpusz conan remote add upload https://api.bintray.com/conan/mpusz/conan-mpusz
conan profile update settings.build_type=${{ matrix.build_type }} default conan profile update settings.build_type=${{ matrix.build_type }} default