Skip to content

Commit

Permalink
Switch back to boost 1.83
Browse files Browse the repository at this point in the history
  • Loading branch information
hedtke committed May 17, 2024
1 parent 317c539 commit 9772077
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ jobs:
run: sudo apt update && sudo apt install libtbb12
- uses: MarkusJx/install-boost@v2.4.1
with:
boost_version: 1.84.0
boost_version: 1.83.0
- name: Install SCIP
run: |
wget https://github.com/scipopt/scip/releases/download/v901/SCIPOptSuite-9.0.1-Linux-ubuntu22.sh
chmod +x SCIPOptSuite-9.0.1-Linux-ubuntu22.sh
./SCIPOptSuite-9.0.1-Linux-ubuntu22.sh --skip-license
- name: Build SCIP++
run: |
CMAKE_PREFIX_PATH=./lib/cmake/scip:./boost/boost/lib/cmake/Boost-1.84.0 cmake -DBUILD_TESTS=ON .
CMAKE_PREFIX_PATH=./lib/cmake/scip:./boost/boost/lib/cmake/Boost-1.83.0 cmake -DBUILD_TESTS=ON .
make -j tests
- name: Run tests
run: ./test/tests
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
pushd ~/.conan2/profiles
sed -i 's/gnu17/17/g' *
popd
conan graph explain .
conan install -of . .
- name: Create CMake Compilation Database
run: cmake --preset conan-release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .
- name: Run Clang-Tidy
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def layout(self):
def requirements(self):
self.requires("scip/8.1.0", transitive_headers=True)
if self.options.with_tests:
self.requires("boost/[>=1.84.0 <2]") # required only for tests
self.requires("boost/[>=1.83.0 <2]") # required only for tests

def generate(self):
tc = CMakeToolchain(self)
Expand Down

0 comments on commit 9772077

Please sign in to comment.