From acae20568371848b86dbb0decdac0a9e4ea5fafa Mon Sep 17 00:00:00 2001 From: edoardolombardi Date: Thu, 9 Oct 2025 12:05:46 +0200 Subject: [PATCH] ci: Upgrade CI/CD pipelines to boost version 1.87 refs: EST-17305 --- .github/workflows/continuous_integration.yml | 4 ++-- environments/ubuntu/Dockerfile | 8 ++++---- src/common/commonUtils.hpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index dfaa9870f9..e42814818b 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -134,7 +134,7 @@ jobs: echo Configure bitpit set "CMAKE_VARIABLES=" set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBoost_USE_STATIC_LIBS=OFF" - set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBOOST_ROOT:PATH=C:\optimad-dependencies\boost-v1.80.0\lib\cmake\Boost-1.80.0" + set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBOOST_ROOT:PATH=C:\optimad-dependencies\boost-v1.87.0\lib\cmake\Boost-1.87.0" set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBITPIT_BUILD_EXAMPLES=ON" set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBITPIT_ENABLE_INTEGRATION_TESTS=ON" set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBITPIT_ENABLE_MPI=${{ matrix.mpi }}" @@ -169,7 +169,7 @@ jobs: call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" - set "PATH=%PATH%;C:\optimad-dependencies\boost-v1.80.0\lib" + set "PATH=%PATH%;C:\optimad-dependencies\boost-v1.87.0\lib" IF "${{ matrix.mpi }}" == "ON" (set "PATH=%PATH%;C:\optimad-dependencies\Metis-v5.1.0\lib\") diff --git a/environments/ubuntu/Dockerfile b/environments/ubuntu/Dockerfile index 4c5b43df20..0d06087962 100644 --- a/environments/ubuntu/Dockerfile +++ b/environments/ubuntu/Dockerfile @@ -42,12 +42,12 @@ RUN cd /opt && \ FROM bitpit-ubuntu-base AS bitpit-ubuntu-boost LABEL stage=bitpit-ubuntu-boost RUN cd /opt && \ - wget --no-verbose https://archives.boost.io/release/1.71.0/source/boost_1_71_0.tar.gz && \ - tar xzf boost_1_71_0.tar.gz && \ - cd boost_1_71_0 && \ + wget --no-verbose https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz && \ + tar xzf boost_1_87_0.tar.gz && \ + cd boost_1_87_0 && \ ./bootstrap.sh --prefix=/opt/boost-install && ./b2 -j 10 install && \ cd .. && \ - rm -rf boost_1_71_0 + rm -rf boost_1_87_0 FROM bitpit-ubuntu-mpi AS bitpit-ubuntu-petsc LABEL stage=bitpit-ubuntu-petsc diff --git a/src/common/commonUtils.hpp b/src/common/commonUtils.hpp index a7e4e0f70d..a6bad1a563 100644 --- a/src/common/commonUtils.hpp +++ b/src/common/commonUtils.hpp @@ -155,7 +155,7 @@ struct DoubleFloatingComparison Donald. E. Knuth, 1998, Addison-Wesley Longman, Inc., ISBN 0-201-89684-2, Addison-Wesley Professional; 3rd edition. - Also see: "https://www.boost.org/doc/libs/1_74_0/libs/test/doc/html/boost_test/testing_tools/extended_comparison/floating_point/floating_points_comparison_theory.html" + Also see: "https://www.boost.org/doc/libs/1_87_0/libs/test/doc/html/boost_test/testing_tools/extended_comparison/floating_point/floating_points_comparison_theory.html" */ struct DoubleFloatingEqual : public DoubleFloatingComparison {