From b2beac4ac0f7f02e0df604c6f07ed5dd3a31b804 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 26 Sep 2023 13:22:15 +0200 Subject: [PATCH] ci: clang-17 support disabled until Conan supports it --- .github/workflows/ci-conan.yml | 41 ++++++++++----------- .github/workflows/ci-test-package-cmake.yml | 41 ++++++++++----------- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 02175d5c..b0dcd9bd 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -106,20 +106,20 @@ jobs: lib: "libc++", conan-config: "", } - - { - name: "Ubuntu Clang-17 + libc++", - os: ubuntu-22.04, - compiler: - { - type: CLANG, - version: 17, - cc: "clang-17", - cxx: "clang++-17", - std: 20, - }, - lib: "libc++", - conan-config: "", - } + # - { + # name: "Ubuntu Clang-17 + libc++", + # os: ubuntu-22.04, + # compiler: + # { + # type: CLANG, + # version: 17, + # cc: "clang-17", + # cxx: "clang++-17", + # std: 20, + # }, + # lib: "libc++", + # conan-config: "", + # } # - { # name: "MacOS Apple Clang 13", # os: macos-11, @@ -209,13 +209,12 @@ jobs: shell: bash run: | pip install -U conan - - name: Add support for clang-17 to Conan's settings.yml - # TODO Remove when Conan will support clang-17 - if: matrix.config.compiler.type == 'CLANG' - shell: bash - run: | - conan profile show - sed -i -e 's/"8", "9", "10", "11", "12", "13", "14", "15", "16"]/"8", "9", "10", "11", "12", "13", "14", "15", "16", "17"]/' ~/.conan2/settings.yml + # - name: Add support for clang-17 to Conan's settings.yml + # # TODO Remove when Conan will support clang-17 + # if: matrix.config.compiler.type == 'CLANG' + # shell: bash + # run: | + # sed -i -e 's/"8", "9", "10", "11", "12", "13", "14", "15", "16"]/"8", "9", "10", "11", "12", "13", "14", "15", "16", "17"]/' ~/.conan2/settings.yml - name: Configure Conan shell: bash run: | diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index c17c0a81..2d173b26 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -89,20 +89,20 @@ jobs: }, lib: "libc++", } - - { - name: "Ubuntu Clang-17 + libc++", - os: ubuntu-22.04, - compiler: - { - type: CLANG, - version: 17, - cc: "clang-17", - cxx: "clang++-17", - std: 20, - }, - lib: "libc++", - conan-config: "", - } + # - { + # name: "Ubuntu Clang-17 + libc++", + # os: ubuntu-22.04, + # compiler: + # { + # type: CLANG, + # version: 17, + # cc: "clang-17", + # cxx: "clang++-17", + # std: 20, + # }, + # lib: "libc++", + # conan-config: "", + # } # - { # name: "MacOS Apple Clang 13", # os: macos-11, @@ -186,13 +186,12 @@ jobs: shell: bash run: | pip install -U conan - - name: Add support for clang-17 to Conan's settings.yml - # TODO Remove when Conan will support clang-17 - if: matrix.config.compiler.type == 'CLANG' - shell: bash - run: | - conan profile show - sed -i -e 's/"8", "9", "10", "11", "12", "13", "14", "15", "16"]/"8", "9", "10", "11", "12", "13", "14", "15", "16", "17"]/' ~/.conan2/settings.yml + # - name: Add support for clang-17 to Conan's settings.yml + # # TODO Remove when Conan will support clang-17 + # if: matrix.config.compiler.type == 'CLANG' + # shell: bash + # run: | + # sed -i -e 's/"8", "9", "10", "11", "12", "13", "14", "15", "16"]/"8", "9", "10", "11", "12", "13", "14", "15", "16", "17"]/' ~/.conan2/settings.yml - name: Configure Conan shell: bash run: |