Skip to content

Commit

Permalink
Update boost version in Dockerfile.
Browse files Browse the repository at this point in the history
  • Loading branch information
mjziebarth committed Sep 22, 2024
1 parent 847105c commit 75c2e3c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ jobs:
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
# Monkey-patched install of newer boost version:
wget -q https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2
wget -q https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2
mkdir boost-dl
tar --bzip2 -xf boost_1_80_0.tar.bz2 -C boost-dl
tar --bzip2 -xf boost_1_86_0.tar.bz2 -C boost-dl
sudo rm -r /usr/include/boost
sudo cp -r boost-dl/boost_1_80_0/boost /usr/include
sudo cp -r boost-dl/boost_1_86_0/boost /usr/include
# Python installs:
python3 -m pip install --upgrade pip
sudo apt purge python3-setuptools
Expand Down
19 changes: 13 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,22 @@ RUN set -eux; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*; \
# Monkey-patched install of newer boost version:
wget -q https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.bz2; \
echo "6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e boost_1_83_0.tar.bz2" \
wget -q https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2; \
echo "1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b boost_1_86_0.tar.bz2" \
| sha256sum --check; \
mkdir boost-dl; \
tar --bzip2 -xf boost_1_83_0.tar.bz2 -C boost-dl; \
rm boost_1_83_0.tar.bz2; \
tar --bzip2 -xf boost_1_86_0.tar.bz2 -C boost-dl; \
rm boost_1_86_0.tar.bz2; \
rm -r /usr/include/boost; \
cp -r boost-dl/boost_1_83_0/boost /usr/include; \
rm -r boost-dl
cp -r boost-dl/boost_1_86_0/boost /usr/include; \
rm -r boost-dl; \
wget -q https://github.com/CGAL/cgal/releases/download/v5.6.1/CGAL-5.6.1-library.tar.xz; \
mkdir cgal-dl; \
tar -xf CGAL-5.6.1-library.tar.xz -C cgal-dl; \
rm CGAL-5.6.1-library.tar.xz; \
rm -r /usr/include/CGAL; \
cp -r cgal-dl/CGAL-5.6.1/include/CGAL /usr/include; \
rm -r cgal-dl

# Install Cython:
RUN set -eux; \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ and this project adheres to
### [2.0.2] - 2024-09-22
#### Changed
- Adjust `quantileinverter.cpp` to refactored code in Boost 1.84.
- Update Boost version in `Dockerfile`.


### [2.0.1] - 2023-01-06
Expand Down

0 comments on commit 75c2e3c

Please sign in to comment.