From 6f7c106cf66149e5132dad42332cd2d9a302aca7 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 29 Apr 2021 08:33:05 +0200 Subject: [PATCH] ci: clang-12 is now officially supported by Conan 1.36 --- .github/workflows/ci-conan.yml | 6 ------ .github/workflows/ci-test-package-cmake.yml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index d93a3c5d..668e6559 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -121,12 +121,6 @@ jobs: conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default fi 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 shell: bash env: diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index c2fcebcf..ea9f6696 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -143,12 +143,6 @@ jobs: conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default fi 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 shell: bash run: |