Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ortools: Update to version 9.10 #328

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ortools: Update to version 9.10 #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae691c
ortools: Update to version 9.10
hovind May 12, 2024
519465d
.bazelrc: Explicitly disable `bzlmod`
hovind Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

common --noexperimental_enable_bzlmod

build --cxxopt "-std=c++17"
build --cxxopt "-ffp-contract=off"
build --host_cxxopt "-std=c++17"
Expand Down
8 changes: 4 additions & 4 deletions dependency_support/com_google_absl/com_google_absl.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

"""Registers Bazel workspaces for the GNU readline library."""

load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")

def com_google_absl():
maybe(
git_repository,
new_git_repository,
name = "com_google_absl",
tag = "20230125.3",
patches = ["@com_google_ortools//patches:abseil-cpp-20230125.3.patch"],
tag = "20240116.2",
patches = ["@com_google_ortools//patches:abseil-cpp-20240116.2.patch"],
patch_args = ["-p1"],
remote = "https://github.com/abseil/abseil-cpp.git",
)
14 changes: 7 additions & 7 deletions dependency_support/com_google_ortools/com_google_ortools.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ def com_google_ortools():
maybe(
http_archive,
name = "com_google_ortools",
strip_prefix = "or-tools-9.7",
urls = ["https://github.com/google/or-tools/archive/refs/tags/v9.7.tar.gz"],
sha256 = "054d9517fc6c83f15150c93ef1c2c674ffd7d4a0d1fdc78f6ef8bc3e25c2e339",
strip_prefix = "or-tools-9.10",
urls = ["https://github.com/google/or-tools/archive/refs/tags/v9.10.tar.gz"],
sha256 = "e7c27a832f3595d4ae1d7e53edae595d0347db55c82c309c8f24227e675fd378",
)
maybe(
new_git_repository,
name = "scip",
build_file = "@com_google_ortools//bazel:scip.BUILD",
patches = ["@com_google_ortools//bazel:scip.patch"],
build_file = "@com_google_ortools//bazel:scip.BUILD.bazel",
patches = ["@com_google_ortools//bazel:scip-v900.patch"],
patch_args = ["-p1"],
tag = "v803",
tag = "v900",
remote = "https://github.com/scipopt/scip.git",
)
maybe(
http_archive,
name = "bliss",
build_file = "@com_google_ortools//bazel:bliss.BUILD",
build_file = "@com_google_ortools//bazel:bliss.BUILD.bazel",
patches = ["@com_google_ortools//bazel:bliss-0.73.patch"],
sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84",
url = "https://github.com/google/or-tools/releases/download/v9.0/bliss-0.73.zip",
Expand Down
8 changes: 4 additions & 4 deletions dependency_support/com_google_protobuf/com_google_protobuf.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ def com_google_protobuf():
maybe(
http_archive,
name = "com_google_protobuf",
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v23.3/protobuf-23.3.tar.gz"],
strip_prefix = "protobuf-23.3",
integrity = "sha256-Ol9HrTqhAZLFV3/whrJLlzmjaTfDTOq225EqFqPvf44=",
urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v26.1.tar.gz"],
strip_prefix = "protobuf-26.1",
sha256 = "4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8",
patch_args = ["-p1"],
patches = ["@com_google_ortools//patches:protobuf-v23.3.patch"],
patches = ["@com_google_ortools//patches:protobuf-v26.1.patch"],
)