diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8d9c1cd55d..eab56c180c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -79,7 +79,7 @@ jobs: - name: 'awslc' install_packages: libidn2-dev - install_steps: awslc + install_steps: awslc clean generate: -DOPENSSL_ROOT_DIR=/home/runner/awslc -DUSE_ECH=ON -DCMAKE_UNITY_BUILD=OFF -DCURL_DROP_UNUSED=ON -DCURL_PATCHSTAMP=test-patch -DCURL_ENABLE_NTLM=ON - name: 'boringssl' @@ -916,6 +916,9 @@ jobs: run: | if [ "${MATRIX_BUILD}" = 'cmake' ]; then cmake --install bld --strip + if [[ "${MATRIX_INSTALL_STEPS}" = *'clean'* ]]; then + cmake --build bld --target curl_uninstall + fi else make -C bld V=1 install fi @@ -962,6 +965,9 @@ jobs: fi if [ "${MATRIX_BUILD}" = 'cmake' ]; then cmake --build bld --verbose --target "${TEST_TARGET}" + if [[ "${MATRIX_INSTALL_STEPS}" = *'clean'* ]]; then + cmake --build bld --target clean-certs + fi else make -C bld V=1 "${TEST_TARGET}" fi diff --git a/CMake/cmake_uninstall.in.cmake b/CMake/cmake_uninstall.in.cmake index 801c4c406e..4cc34d9289 100644 --- a/CMake/cmake_uninstall.in.cmake +++ b/CMake/cmake_uninstall.in.cmake @@ -35,16 +35,8 @@ string(REGEX REPLACE "\n" ";" _files "${_files}") foreach(_file ${_files}) message(STATUS "Uninstalling $ENV{DESTDIR}${_file}") if(IS_SYMLINK "$ENV{DESTDIR}${_file}" OR EXISTS "$ENV{DESTDIR}${_file}") - execute_process( - COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${_file}" - RESULT_VARIABLE rm_retval - OUTPUT_QUIET - ERROR_QUIET - ) - if(NOT "${rm_retval}" STREQUAL 0) - message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${_file}") - endif() + execute_process(COMMAND "@CMAKE_COMMAND@" -E rm -f -- "$ENV{DESTDIR}${_file}") else() - message(STATUS "File $ENV{DESTDIR}${_file} does not exist.") + message(STATUS "File does not exist: $ENV{DESTDIR}${_file}") endif() endforeach() diff --git a/tests/certs/CMakeLists.txt b/tests/certs/CMakeLists.txt index ebe6fbcfa7..a96593a24e 100644 --- a/tests/certs/CMakeLists.txt +++ b/tests/certs/CMakeLists.txt @@ -39,7 +39,7 @@ if(NOT _CURL_SKIP_BUILD_CERTS) endif() add_custom_target(clean-certs - COMMAND ${CMAKE_COMMAND} -E remove ${GENERATEDCERTS} + COMMAND ${CMAKE_COMMAND} -E rm -f ${GENERATEDCERTS} "test-*.csr" "test-*.der" "test-*.keyenc"