Skip to content

Commit ae5cfad

Browse files
committed
ci: fix cmake build preset name to include build-folder prefix
1 parent 3264fba commit ae5cfad

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/ci-test-package-cmake.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,14 @@ jobs:
203203
working-directory: src
204204
run: |
205205
call ..\build\${{ matrix.conan-build-folder }}\generators\conanbuild.bat
206-
cmake --build --preset conan-${{ steps.build_type.outputs.lowercase }} --target install
206+
cmake --build --preset conan-${{ matrix.conan-build-folder }}-${{ steps.build_type.outputs.lowercase }} --target install
207207
- name: Install mp-units
208208
if: matrix.toolchain.compiler.type != 'MSVC'
209209
shell: bash
210210
working-directory: src
211211
run: |
212212
source ../build/${{ matrix.conan-build-folder }}/generators/conanbuild.sh
213-
cmake --build --preset conan-${{ steps.build_type.outputs.lowercase }} --target install
213+
cmake --build --preset conan-${{ matrix.conan-build-folder }}-${{ steps.build_type.outputs.lowercase }} --target install
214214
- name: Provide dependencies for test_package
215215
shell: bash
216216
working-directory: test_package
@@ -293,7 +293,7 @@ jobs:
293293
echo "conan install . -b missing ${{ matrix.conan-settings }} -c user.mp-units.build:all=False ${{ matrix.conan-config }}" >> $GITHUB_STEP_SUMMARY
294294
echo "echo '{\"version\":4,\"include\":[\"../CMakeUserPresets.json\"]}' > src/CMakeUserPresets.json" >> $GITHUB_STEP_SUMMARY
295295
echo "echo '{\"version\":4,\"include\":[\"../CMakeUserPresets.json\"]}' > test_package/CMakeUserPresets.json" >> $GITHUB_STEP_SUMMARY
296-
echo "(cd src && source ../build/${{ matrix.conan-build-folder }}/generators/conanbuild.sh && cmake --preset conan-${{ matrix.conan-build-folder }} -DCMAKE_INSTALL_PREFIX=../out && cmake --build --preset conan-${BUILD_TYPE_LOWER} --target install)" >> $GITHUB_STEP_SUMMARY
296+
echo "(cd src && source ../build/${{ matrix.conan-build-folder }}/generators/conanbuild.sh && cmake --preset conan-${{ matrix.conan-build-folder }} -DCMAKE_INSTALL_PREFIX=../out && cmake --build --preset conan-${{ matrix.conan-build-folder }}-${BUILD_TYPE_LOWER} --target install)" >> $GITHUB_STEP_SUMMARY
297297
echo "(cd test_package && source ../build/${{ matrix.conan-build-folder }}/generators/conanbuild.sh && cmake --preset conan-${{ matrix.conan-build-folder }} -Dmp-units_DIR=../build/${{ matrix.conan-build-folder }} -Bbuild/local && cmake --build build/local --config ${{ matrix.build_type }})" >> $GITHUB_STEP_SUMMARY
298298
echo "./test_package/build/local/${{ matrix.build_type }}/test_package-headers" >> $GITHUB_STEP_SUMMARY
299299
echo '```' >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)