From 31f45cee793066c2a3a307a3bea7d32bbb398551 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 26 Sep 2023 12:45:51 +0200 Subject: [PATCH] ci: workaround for Conan not supporting clang-17 --- .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 8c231e302..186741c11 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -219,12 +219,12 @@ jobs: sed -i.backup '/^\[settings\]$/,/^\[/ s/^compiler.cppstd=.*/compiler.cppstd=${{ matrix.config.compiler.std }}/' ~/.conan2/profiles/default sed -i.backup '/^\[settings\]$/,/^\[/ s/^build_type=.*/build_type=${{ matrix.build_type }}/' ~/.conan2/profiles/default conan profile show -pr 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-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: Create Conan package shell: bash run: | diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index 3c8b9cc3f..ff83951cd 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -197,12 +197,12 @@ jobs: sed -i.backup '/^\[settings\]$/,/^\[/ s/^compiler.cppstd=.*/compiler.cppstd=${{ matrix.config.compiler.std }}/' ~/.conan2/profiles/default sed -i.backup '/^\[settings\]$/,/^\[/ s/^build_type=.*/build_type=${{ matrix.build_type }}/' ~/.conan2/profiles/default conan profile show -pr 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-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: Install Conan dependencies shell: bash run: |