Upgrade or-tools to v9.1

irfansharif · Oct 2, 2021 · 1107135 · 1107135
1 parent 3ace05d
commit 1107135
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "c-deps/abseil-cpp"]
 	path = c-deps/abseil-cpp
 	url = [email protected]:abseil/abseil-cpp.git
+[submodule "c-deps/protobuf"]
+	path = c-deps/protobuf
+	url = [email protected]:protocolbuffers/protobuf.git
diff --git a/Makefile b/Makefile
@@ -36,7 +36,8 @@ proto: internal/pb/*.proto
 bzl: FORCE
 	@echo "--- generating bazel files"
 	@echo "build --cxxopt=-std=c++17 --experimental_convenience_symlinks=ignore --define gotags=bazel" > $@.tmp
-	@echo "test --cxxopt=-std=c++17 --test_env=BAZEL_WORKSPACE=$(shell bazel info workspace) --define gotags=bazel \
+	@echo "test  --cxxopt=-std=c++17 --experimental_convenience_symlinks=ignore --define gotags=bazel \
+		--test_env=BAZEL_WORKSPACE=$(shell bazel info workspace) \
 		--sandbox_writable_path=$(shell bazel info workspace)/testdata \
 		--sandbox_writable_path=$(shell bazel info workspace)/internal/testutils/parser/testdata \
 		--sandbox_writable_path=$(shell bazel info workspace)/internal/testutils/parser/lexer/testdata" >> $@.tmp

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ against Google's [Operations Research
 Tools](https://developers.google.com/optimization/). It exposes a high-level
 package for the [CP-SAT
 Solver](https://developers.google.com/optimization/cp/cp_solver), targeting the
-[v9.0](https://github.com/google/or-tools/releases/tag/v9.0) release.
+[v9.1](https://github.com/google/or-tools/releases/tag/v9.1) release.
 
 ### Examples
 

diff --git a/WORKSPACE b/WORKSPACE
@@ -3,19 +3,19 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "ortools",
-    commit = "b37d9c786b69128f3505f15beca09e89bf078a89",  # tag v9.0
+    commit = "86d4c54",  # tag v9.1
     remote = "https://github.com/google/or-tools.git",
 )
 
 git_repository(
     name = "com_google_absl",
-    commit = "e1d388e", # release 20210324.1
+    commit = "278e0a0", # release 20210324.2
     remote = "https://github.com/abseil/abseil-cpp.git",
 )
 
 git_repository(
     name = "com_google_protobuf",
-    commit = "436bd78",  # release v3.15.8
+    commit = "89b14b1",  # release v3.18.0
     remote = "https://github.com/protocolbuffers/protobuf.git",
 )
 

diff --git a/c-deps/abseil-cpp b/c-deps/abseil-cpp
diff --git a/c-deps/or-tools b/c-deps/or-tools
diff --git a/c-deps/protobuf b/c-deps/protobuf