ci: clang-17 support disabled until Conan supports it

This commit is contained in:
Mateusz Pusz
2023-09-26 13:22:15 +02:00
parent 28ecc40092
commit b2beac4ac0
2 changed files with 40 additions and 42 deletions

View File

@@ -106,20 +106,20 @@ jobs:
lib: "libc++", lib: "libc++",
conan-config: "", conan-config: "",
} }
- { # - {
name: "Ubuntu Clang-17 + libc++", # name: "Ubuntu Clang-17 + libc++",
os: ubuntu-22.04, # os: ubuntu-22.04,
compiler: # compiler:
{ # {
type: CLANG, # type: CLANG,
version: 17, # version: 17,
cc: "clang-17", # cc: "clang-17",
cxx: "clang++-17", # cxx: "clang++-17",
std: 20, # std: 20,
}, # },
lib: "libc++", # lib: "libc++",
conan-config: "", # conan-config: "",
} # }
# - { # - {
# name: "MacOS Apple Clang 13", # name: "MacOS Apple Clang 13",
# os: macos-11, # os: macos-11,
@@ -209,13 +209,12 @@ jobs:
shell: bash shell: bash
run: | run: |
pip install -U conan pip install -U conan
- name: Add support for clang-17 to Conan's settings.yml # - name: Add support for clang-17 to Conan's settings.yml
# TODO Remove when Conan will support clang-17 # # TODO Remove when Conan will support clang-17
if: matrix.config.compiler.type == 'CLANG' # if: matrix.config.compiler.type == 'CLANG'
shell: bash # shell: bash
run: | # 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
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 - name: Configure Conan
shell: bash shell: bash
run: | run: |

View File

@@ -89,20 +89,20 @@ jobs:
}, },
lib: "libc++", lib: "libc++",
} }
- { # - {
name: "Ubuntu Clang-17 + libc++", # name: "Ubuntu Clang-17 + libc++",
os: ubuntu-22.04, # os: ubuntu-22.04,
compiler: # compiler:
{ # {
type: CLANG, # type: CLANG,
version: 17, # version: 17,
cc: "clang-17", # cc: "clang-17",
cxx: "clang++-17", # cxx: "clang++-17",
std: 20, # std: 20,
}, # },
lib: "libc++", # lib: "libc++",
conan-config: "", # conan-config: "",
} # }
# - { # - {
# name: "MacOS Apple Clang 13", # name: "MacOS Apple Clang 13",
# os: macos-11, # os: macos-11,
@@ -186,13 +186,12 @@ jobs:
shell: bash shell: bash
run: | run: |
pip install -U conan pip install -U conan
- name: Add support for clang-17 to Conan's settings.yml # - name: Add support for clang-17 to Conan's settings.yml
# TODO Remove when Conan will support clang-17 # # TODO Remove when Conan will support clang-17
if: matrix.config.compiler.type == 'CLANG' # if: matrix.config.compiler.type == 'CLANG'
shell: bash # shell: bash
run: | # 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
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 - name: Configure Conan
shell: bash shell: bash
run: | run: |