Upgrade or-tools to v9.1

irfansharif · irfansharif · commit 11071354d9bd · 2021-10-01T22:44:21.000-04:00
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "c-deps/abseil-cpp"]
 	path = c-deps/abseil-cpp
 	url = git@github.com:abseil/abseil-cpp.git
+[submodule "c-deps/protobuf"]
+	path = c-deps/protobuf
+	url = git@github.com: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
@@ -1 +1 @@
-Subproject commit b56cbdd23834a65682c0b46f367f8679e83bc894
+Subproject commit 278e0a071885a22dcd2fd1b5576cc44757299343
diff --git a/c-deps/or-tools b/c-deps/or-tools
@@ -1 +1 @@
-Subproject commit b37d9c786b69128f3505f15beca09e89bf078a89
+Subproject commit 86d4c543f717fa8716a9d66c25143660668bf825
diff --git a/c-deps/protobuf b/c-deps/protobuf
@@ -0,0 +1 @@
+Subproject commit 89b14b1d16eba4d44af43256fc45b24a6a348557

Original file line number	Diff line number	Diff line change
`@@ -3,19 +3,19 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")`
`3`	`3`
`4`	`4`	`git_repository(`
`5`	`5`	`name = "ortools",`
`6`		`- commit = "b37d9c786b69128f3505f15beca09e89bf078a89", # tag v9.0`
	`6`	`+ commit = "86d4c54", # tag v9.1`
`7`	`7`	`remote = "https://github.com/google/or-tools.git",`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`git_repository(`
`11`	`11`	`name = "com_google_absl",`
`12`		`- commit = "e1d388e", # release 20210324.1`
	`12`	`+ commit = "278e0a0", # release 20210324.2`
`13`	`13`	`remote = "https://github.com/abseil/abseil-cpp.git",`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`git_repository(`
`17`	`17`	`name = "com_google_protobuf",`
`18`		`- commit = "436bd78", # release v3.15.8`
	`18`	`+ commit = "89b14b1", # release v3.18.0`
`19`	`19`	`remote = "https://github.com/protocolbuffers/protobuf.git",`
`20`	`20`	`)`
`21`	`21`