From 48c4edf004971a4de6fcfed0dfa816d830e550d1 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Fri, 10 Sep 2021 07:36:11 +0200 Subject: [PATCH] ci: Conan 1.40 added supports for clang-13 Leaving the code commented for the next case with clang-14 --- .github/workflows/ci-conan.yml | 12 ++++++------ .github/workflows/ci-test-package-cmake.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 1525ed23..cbb0512b 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -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: diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index 043d53e7..47fe31b1 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -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: |