diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9992d8daee..5ae82ddbef 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,4 +9,4 @@ - [ ] Documentation module page added or updated. - [ ] New entry in the [ChangeLog.md](https://github.com/DGtal-team/DGtal/blob/master/ChangeLog.md) added. - [ ] No warning raised in Debug mode. -- [ ] All continuous integration tests pass (Github Actions & appveyor) +- [ ] All continuous integration tests pass (Github Actions) diff --git a/ChangeLog.md b/ChangeLog.md index c9a9f5aff4..45b83afa8f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -34,6 +34,8 @@ ## Bug fixes - *General* + - Fix conan file upload issue and log message. (Bertrand Kerautret, + [#1704](https://github.com/DGtal-team/DGtal/pull/1704)) - Fix of couple of doxygen warnings that cause errors on Github Actions CI bots. (David Coeurjolly, [#1672](https://github.com/DGtal-team/DGtal/pull/1672)) - Removing "WITH_BENCHMARK" option as Google Benchmark is already included when building diff --git a/cmake/CheckDGtalDependencies.cmake b/cmake/CheckDGtalDependencies.cmake index 315fb37da3..c501f75048 100644 --- a/cmake/CheckDGtalDependencies.cmake +++ b/cmake/CheckDGtalDependencies.cmake @@ -19,10 +19,31 @@ if (ENABLE_CONAN) message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake" - TLS_VERIFY ON) + STATUS DOWNLOAD_STATUS + TLS_VERIFY ON) + list(GET DOWNLOAD_STATUS 0 STATUS_CODE) + list(GET DOWNLOAD_STATUS 1 ERROR_MESSAGE) + # Check if download was successful. + if(${STATUS_CODE} EQUAL 0) + message(STATUS "Download completed successfully!") + else() + message(STATUS "Error occurred during download: ${ERROR_MESSAGE}") + message(STATUS "Trying turning TLS_VERIFY OFF") + file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" + "${CMAKE_BINARY_DIR}/conan.cmake" + STATUS DOWNLOAD_STATUS + TLS_VERIFY OFF) + list(GET DOWNLOAD_STATUS 0 STATUS_CODE) + list(GET DOWNLOAD_STATUS 1 ERROR_MESSAGE) + if(${STATUS_CODE} EQUAL 0) + message(STATUS "Download completed successfully!") + else() + message(FATAL_ERROR "Error occurred during download: ${ERROR_MESSAGE}") + endif() + endif() endif() - include(${CMAKE_BINARY_DIR}/conan.cmake) + include("${CMAKE_BINARY_DIR}/conan.cmake") conan_cmake_configure(REQUIRES zlib/1.2.13 boost/1.81.0