Fix [python-setup].resolver_jobs default value to recognize containers (Cherry-pick of #12139)
#12140
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
…ers (Cherry-pick of pantsbuild#12139) [ci skip-rust] [ci skip-build-wheels]
|
Not a clean cherry-pick - |
|
I'll wait for the dust to actually settle on a cherry-pickable main commit. |
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
jsirois
approved these changes
May 28, 2021
|
Sure, but we squash merge so not sure it matters much. |
|
I'm saying - as a reviewer / git log reader - I want to see a cherry-pick is a cherry-pick - for real. That's why I use -x to "sign" it. I do realize in this case you called the shot of having to fudge in the 1st commit and there's no way around that. But the second commit was technically not kosher. |
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.
[ci skip-rust]
[ci skip-build-wheels]