ci: Conan 1.40 added supports for clang-13

Leaving the code commented for the next case with clang-14
This commit is contained in:
Mateusz Pusz
2021-09-10 07:36:11 +02:00
parent 89d704f867
commit 48c4edf004
2 changed files with 12 additions and 12 deletions

View File

@@ -126,12 +126,12 @@ jobs:
conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default
fi
conan profile show default
- name: Add support for clang-13 to Conan's settings.yml
# TODO Remove when Conan will support clang-13
if: matrix.config.compiler.type == 'CLANG'
shell: bash
run: |
sed -i -e 's/"8", "9", "10", "11", "12"]/"8", "9", "10", "11", "12", "13"]/' ~/.conan/settings.yml
# - name: Add support for clang-13 to Conan's settings.yml
# # TODO Remove when Conan will support clang-13
# if: matrix.config.compiler.type == 'CLANG'
# shell: bash
# run: |
# sed -i -e 's/"8", "9", "10", "11", "12"]/"8", "9", "10", "11", "12", "13"]/' ~/.conan/settings.yml
- name: Run Conan Package Tools
shell: bash
env:

View File

@@ -144,12 +144,12 @@ jobs:
fi
conan profile update conf.tools.cmake.cmaketoolchain:generator=Ninja default
conan profile show default
- name: Add support for clang-13 to Conan's settings.yml
# TODO Remove when Conan will support clang-13
if: matrix.config.compiler.type == 'CLANG'
shell: bash
run: |
sed -i -e 's/"8", "9", "10", "11", "12"]/"8", "9", "10", "11", "12", "13"]/' ~/.conan/settings.yml
# - name: Add support for clang-13 to Conan's settings.yml
# # TODO Remove when Conan will support clang-13
# if: matrix.config.compiler.type == 'CLANG'
# shell: bash
# run: |
# sed -i -e 's/"8", "9", "10", "11", "12"]/"8", "9", "10", "11", "12", "13"]/' ~/.conan/settings.yml
- name: Install Conan dependencies
shell: bash
run: |