Skip to content

Commit 6ab0c12

Browse files
authored
Merge pull request #38 from scipopt/scip-1000
Update to SCIP 10.0.0
2 parents eb3357a + 93b3c10 commit 6ab0c12

4 files changed

Lines changed: 348 additions & 47 deletions

File tree

.github/workflows/main.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,27 +64,24 @@ jobs:
6464
CXX: g++-11
6565
steps:
6666
- uses: actions/checkout@v3
67-
- name: Install parallelism library for C++
68-
run: sudo apt update && sudo apt install libtbb12
69-
- uses: MarkusJx/install-boost@v2.4.1
70-
with:
71-
boost_version: 1.84.0
7267
- name: Install SCIP
7368
run: |
74-
wget https://github.com/scipopt/scip/releases/download/v923/SCIPOptSuite-9.2.3-Linux-ubuntu22.sh
75-
chmod +x SCIPOptSuite-9.2.3-Linux-ubuntu22.sh
76-
./SCIPOptSuite-9.2.3-Linux-ubuntu22.sh --skip-license
69+
wget -q https://github.com/scipopt/scip/releases/download/v10.0.0/scipoptsuite_10.0.0-1+jammy_amd64.deb
70+
sudo apt update
71+
sudo apt install -y ./scipoptsuite_10.0.0-1+jammy_amd64.deb
72+
sudo apt install -y libmpfr-dev libboost-all-dev
7773
- name: Build SCIP++
7874
run: |
79-
CMAKE_PREFIX_PATH=./lib/cmake/scip:./boost/boost/lib/cmake/Boost-1.84.0 cmake -DBUILD_TESTS=ON .
75+
cmake -DBUILD_TESTS=ON .
8076
make -j tests
8177
- name: Run tests
8278
run: ./test/tests
8379
test_release_mac:
84-
runs-on: macos-13
80+
runs-on: macos-15
8581
steps:
8682
- uses: actions/checkout@v3
87-
- uses: turtlebrowser/get-conan@main
83+
- name: Install Conan
84+
run: brew install conan
8885
- name: Run Conan Install
8986
run: |
9087
conan profile detect

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
44

55
## [Unreleased] - [Doc:Unreleased]
66

7+
### Changed
8+
9+
- [PR38](https://github.com/scipopt/SCIPpp/pull/38) Update to SCIP 10.0.0.
10+
711
## [1.3.0] - 2025-10-08
812

913
### Changed

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def layout(self):
7373
cmake_layout(self)
7474

7575
def requirements(self):
76-
self.requires("scip/9.2.3", transitive_headers=True)
76+
self.requires("scip/10.0.0", transitive_headers=True)
7777
if self.options.with_tests:
7878
self.requires("boost/[>=1.84.0 <2]") # required only for tests
7979

0 commit comments

Comments
 (0)