Skip to content

Commit c71c2de

Browse files
committed
🔨 Fix conan-preset being wrong for github action
1 parent 844cf29 commit c71c2de

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

.github/workflows/cmake-multi-platform.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
shell: bash
4545
run: |
4646
conan profile detect --force
47-
# Add system package manager settings to detected profile
4847
echo "[conf]" >> ~/.conan2/profiles/default
4948
echo "tools.system.package_manager:mode=install" >> ~/.conan2/profiles/default
5049
echo "tools.system.package_manager:sudo=True" >> ~/.conan2/profiles/default
@@ -76,18 +75,13 @@ jobs:
7675
- name: Configure CMake
7776
shell: bash
7877
run: |
79-
preset="conan-release"
80-
if [ "${{ matrix.build_type }}" = "RelWithDebInfo" ]; then
81-
preset="conan-relwithdebinfo"
82-
fi
83-
8478
if [ "${{ runner.os }}" == "Windows" ]; then
8579
build_dir="${{ github.workspace }}\\build\\${{ matrix.build_type }}"
8680
else
8781
build_dir="${{ github.workspace }}/build/${{ matrix.build_type }}"
8882
fi
8983
90-
cmake --preset $preset \
84+
cmake --preset conan-default \
9185
-S . \
9286
-B "$build_dir" \
9387
-G Ninja \

0 commit comments

Comments
 (0)