mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-01 03:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Conan settings update step moved up

Browse Source
This commit is contained in:
Mateusz Pusz
2023-09-26 12:52:51 +02:00
parent 31f45cee79
commit d9dc374561
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci-conan.yml vendored
View File

@@ -209,6 +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: |
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: |
@@ -219,12 +225,6 @@ 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-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: |

12
.github/workflows/ci-test-package-cmake.yml vendored
View File

@@ -186,6 +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: |
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: |
@@ -197,12 +203,6 @@ 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-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: |