Skip to content

Commit 1cfd2ea

Browse files
committed
Updated OR-Tools to 9.15
1 parent 79edadf commit 1cfd2ea

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.17.0 (unreleased)
2+
3+
- Updated OR-Tools to 9.15
4+
15
## 0.16.3 (2026-01-05)
26

37
- Fixed errors with Rice 4.9

Rakefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ task :update do
2626
require "open-uri"
2727
require "tmpdir"
2828

29-
version = "9.14.6206"
29+
version = "9.15.6755"
3030
distributions = [
31-
"arm64_macOS-15.5",
32-
"x86_64_macOS-15.5",
31+
"arm64_macOS-26.2",
32+
"x86_64_macOS-26.2",
3333
"amd64_ubuntu-24.04",
3434
"amd64_ubuntu-22.04",
3535
"amd64_ubuntu-20.04",

ext/or-tools/vendor.rb

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
require "net/http"
44
require "tmpdir"
55

6-
version = "9.14.6206"
6+
version = "9.15.6755"
77

88
arch = RbConfig::CONFIG["host_cpu"]
99
arm = arch.match?(/arm|aarch64/i)
1010

1111
if RbConfig::CONFIG["host_os"].match?(/darwin/i)
1212
if arm
13-
filename = "or-tools_arm64_macOS-15.5_cpp_v#{version}.tar.gz"
14-
checksum = "7dd3fc35acc74a85f44e39099dcc2caa698d7a99e659e8d8456ce25bafe4a63b"
13+
filename = "or-tools_arm64_macOS-26.2_cpp_v#{version}.tar.gz"
14+
checksum = "de0400a45939a66ee13cd8360c230e830fc5e03a6ed5a8a8b60f58a39e4a67bc"
1515
else
16-
filename = "or-tools_x86_64_macOS-15.5_cpp_v#{version}.tar.gz"
17-
checksum = "de7ed91b0fe90094fb5f5ebd19869b69a8d52b9752e456752208a22a05b14f7f"
16+
filename = "or-tools_x86_64_macOS-26.2_cpp_v#{version}.tar.gz"
17+
checksum = "d2d36482727520ccaff979eba16f53e6b2cabf40b6fd1126e4d3b34fad2fe851"
1818
end
1919
else
2020
# try /etc/os-release with fallback to /usr/lib/os-release
@@ -29,22 +29,22 @@
2929

3030
if os == "ubuntu" && os_version == "24.04" && !arm
3131
filename = "or-tools_amd64_ubuntu-24.04_cpp_v#{version}.tar.gz"
32-
checksum = "be3855a32a7390c3957d43ebd3faec1610acdc28f06ef33cb50f1f72a9aa6621"
32+
checksum = "6f389320672cee00b78aacefb2bde33fef0bb988c3b2735573b9fffd1047fbda"
3333
elsif os == "ubuntu" && os_version == "22.04" && !arm
3434
filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
35-
checksum = "127a82bbbf304d26721bb9b41ecce2d66f21c757204ab5aa2cc37eaa6ffb7eb6"
35+
checksum = "0b30114d7c05f0596286bf3ef8d02adcf5f45be3b39273490e6bb74a2a9bd1ea"
3636
elsif os == "ubuntu" && os_version == "20.04" && !arm
3737
filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
38-
checksum = "7705a7c11e0db4ec1d7841e184acd204787174c6cbdb2fbd81169823ed148c6c"
38+
checksum = "cfe5068b0fe4bafff916ab1b75670b341e80571c8cfd8b647dfe3e97a233e836"
3939
elsif os == "debian" && os_version == "12" && !arm
4040
filename = "or-tools_amd64_debian-12_cpp_v#{version}.tar.gz"
41-
checksum = "285e8ec3a3399e45cdb4f67f48d4b65dbfa9c013b29036d409c72f96f0f34ab9"
41+
checksum = "b2c9870c8778eeb26c98742402da17da039c058fca7eca87be5c90832b04153c"
4242
elsif os == "debian" && os_version == "11" && !arm
4343
filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
44-
checksum = "646b53e8d355290c4627d6bad0d36baeff38dc43605d317ac02cb811688d4dd2"
44+
checksum = "c6c4341ff8f9aae3e77f161ca8ea3bb0d22f35ff696596fd11ec51c5da6bd4f7"
4545
elsif os == "arch" && !arm
4646
filename = "or-tools_amd64_archlinux_cpp_v#{version}.tar.gz"
47-
checksum = "6be039a13c3be7a3dbcdc413d455b43bba4590ce38859062898835effefb5ca4"
47+
checksum = "5505079f7b2a6d9379ba6ae446a3a639226d455ef1cfa32d2d23ffc4566e3a4b"
4848
else
4949
platform =
5050
if Gem.win_platform?
@@ -141,6 +141,7 @@ def download_file(url, download_path, redirects = 0)
141141
license_files = Dir.glob("**/*{LICENSE,LICENCE,NOTICE,COPYING,license,licence,notice,copying}*", base: extract_path)
142142
raise "License not found" unless license_files.any?
143143
license_files.each do |file|
144+
next if File.directory?(File.join(extract_path, file))
144145
FileUtils.mkdir_p(File.join(path, File.dirname(file)))
145146
FileUtils.mv(File.join(extract_path, file), File.join(path, file))
146147
end

test/constraint_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ def test_cryptoarithmetic
153153
status = solver.solve(model, solution_printer)
154154
assert_equal :optimal, status
155155

156-
assert_equal 184, solver.num_conflicts
157-
assert_equal 1850, solver.num_branches
156+
assert_equal 182, solver.num_conflicts
157+
assert_equal 1777, solver.num_branches
158158
assert_equal 72, solution_printer.solution_count
159159
end
160160

0 commit comments

Comments
 (0)