Skip to content

Commit 865a1c7

Browse files
committed
fix
1 parent c90ee5c commit 865a1c7

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/workflows/build_test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ jobs:
325325
- name: conan downstream
326326
run: >
327327
conan install test/downstream
328-
--lockfile conan.lock
329328
--profile:host '${{ matrix.host_profile }}'
330329
--profile:build '${{ matrix.build_profile }}'
331330
--output-folder=test/downstream/build

.github/workflows/tidy.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
include:
16-
- { os: ubuntu-24.04, compiler: clang-18 }
16+
- { os: ubuntu-24.04, build_profile: ubuntu-24.04-clang-18, host_profile: ubuntu-24.04-clang-18 }
1717
steps:
1818
- name: checkout
1919
uses: actions/checkout@v4
@@ -30,9 +30,13 @@ jobs:
3030
- name: conan remote
3131
run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
3232
- name: conan config
33-
run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
33+
run: conan config install .github/config/conan
3434
- name: conan install
35-
run: conan install . --output-folder=build --build=missing
35+
run: >
36+
conan install .
37+
--lockfile conan.lock
38+
--profile:host '${{ matrix.host_profile }}'
39+
--profile:build '${{ matrix.build_profile }}'
3640
3741
- name: cmake
3842
run: >

0 commit comments

Comments
 (0)