or-tools: 9.4 -> 9.7 #272425
Merged
or-tools: 9.4 -> 9.7 #272425
+60
−60
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wegank
force-pushed
the
or-tools-bump
branch
2 times, most recently
from
81b51bf to
1ac6b73
Compare
|
@ofborg build or-tools or-tools.passthru.tests |
|
@ofborg eval |
andersk
reviewed
Feb 5, 2024
| pybind11_protobuf = fetchFromGitHub { | ||
| owner = "pybind"; | ||
| repo = "pybind11_protobuf"; | ||
| rev = "b713501f1da56d9b76c42f89efd00b97c26c9eac"; |
There was a problem hiding this comment.
According to https://github.com/google/or-tools/blob/v9.7/WORKSPACE#L228, this should be 5baa2dc9d93e3b608cde86dfa4b8c63aeab4ac78.
There was a problem hiding this comment.
I had to use b713501f1da56d9b76c42f89efd00b97c26c9eac for the build to succeed, probably due to some mismatches as in google/or-tools#4027.
|
This should also drop |
13 tasks
wegank
added
the
2.status: merge conflict
ofborg
bot
removed
the
2.status: merge conflict
|
Reopening the PR as or-tools is failing on master. I'll do the next bump to 9.9 in other PR, whose diff is way more significant. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Not to 9.8 as it requires absl-py 2.0 and #264902.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.