From 9e3f61d233f9fe8c5aae67626e1bbb58db91073d Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Thu, 11 Jul 2024 15:26:00 -0400 Subject: [PATCH 1/2] Change linking of MPI with cmake --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d71a950..712c7ca7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,6 @@ else() Boost::fusion Boost::iterator Boost::math - Boost::mpi Boost::mpl Boost::multi_array Boost::numeric_ublas @@ -58,6 +57,14 @@ else() Boost::utility ) + # From CMake 3.30 linking against MPI when it does not exist gives errors + if(BOOST_ENABLE_MPI) + target_link_libraries(boost_numeric_odeint + INTERFACE + Boost::mpi + ) + endif() + endif() if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt") From aa90058057410470919e8046c8e095e51e7122c6 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Thu, 11 Jul 2024 15:33:33 -0400 Subject: [PATCH 2/2] Allow node 16 --- .github/workflows/ci.yml | 1 + .github/workflows/codecov.yml | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86347af4..d45d465e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,7 @@ env: B2_LINK: shared,static LCOV_BRANCH_COVERAGE: 0 CODECOV_NAME: Github Actions + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true jobs: posix: diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index c59d0c88..54cdbce6 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -28,6 +28,7 @@ env: B2_LINK: shared,static LCOV_BRANCH_COVERAGE: 0 CODECOV_NAME: Github Actions + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true jobs: posix: @@ -184,3 +185,15 @@ jobs: - name: Upload coverage if: matrix.coverage run: ci/codecov.sh "upload" + env: + BOOST_CI_CODECOV_IO_UPLOAD: skip + + - name: Upload coverage + if: matrix.coverage + uses: codecov/codecov-action@v4 + with: + disable_search: true + file: coverage.info + name: Github Actions + token: ${{secrets.CODECOV_TOKEN}} + verbose: true