mirror of
https://github.com/mpusz/mp-units.git
synced 2025-08-02 03:44:27 +02:00
ci: clang-12 is now officially supported by Conan 1.36
This commit is contained in:
6
.github/workflows/ci-conan.yml
vendored
6
.github/workflows/ci-conan.yml
vendored
@@ -121,12 +121,6 @@ jobs:
|
|||||||
conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default
|
conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default
|
||||||
fi
|
fi
|
||||||
conan profile show default
|
conan profile show default
|
||||||
- name: Add support for clang-12 to Conan's settings.yml
|
|
||||||
# TODO Remove when Conan will support clang-12 (after clang-12 release)
|
|
||||||
if: matrix.config.compiler.type == 'CLANG'
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
sed -i -e 's/"8", "9", "10", "11"]/"8", "9", "10", "11", "12"]/' ~/.conan/settings.yml
|
|
||||||
- name: Run Conan Package Tools
|
- name: Run Conan Package Tools
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
|
6
.github/workflows/ci-test-package-cmake.yml
vendored
6
.github/workflows/ci-test-package-cmake.yml
vendored
@@ -143,12 +143,6 @@ jobs:
|
|||||||
conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default
|
conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default
|
||||||
fi
|
fi
|
||||||
conan profile show default
|
conan profile show default
|
||||||
- name: Add support for clang-12 to Conan's settings.yml
|
|
||||||
# TODO Remove when Conan will support clang-12 (after clang-12 release)
|
|
||||||
if: matrix.config.compiler.type == 'CLANG'
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
sed -i -e 's/"8", "9", "10", "11"]/"8", "9", "10", "11", "12"]/' ~/.conan/settings.yml
|
|
||||||
- name: Install Conan dependencies
|
- name: Install Conan dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
Reference in New Issue
Block a user