Use rules_jvm_external to fetch turbine#19472
Closed
cushon wants to merge 1 commit intobazelbuild:masterfrom
Closed
Use rules_jvm_external to fetch turbine#19472cushon wants to merge 1 commit intobazelbuild:masterfrom
cushon wants to merge 1 commit intobazelbuild:masterfrom
Conversation
Member
|
@iancha1992 Can you first import the non-third party change, then the third party change? |
Contributor
|
Hi @cushon, Could you please help us in resolving the conflict? |
Instead of checking in a precompiled jar, following the example of bazelbuild#17112
9c886d3 to
aaeeabc
Compare
Contributor
Author
Done |
Member
|
Reopen until the third party change is also merged. |
copybara-service bot
pushed a commit
that referenced
this pull request
Sep 13, 2023
Fix merging of #19472 RELNOTES: None PiperOrigin-RevId: 565033337 Change-Id: Ia4020e87e5cf4f9846b801a2203f4931f1ce5205
Collaborator
|
The third_party change wasn't merged correctly and was reverted as part of the following commit: 2482322 This currently breaks CI on master. |
Member
|
Fixed by ea019d4, sorry about the breakage, please rebase. |
copybara-service bot
pushed a commit
that referenced
this pull request
Sep 13, 2023
This is to facilitate moving the rule implementation out of Bazel itself and into rules_python. This also makes the tests pass when an allowlist is used to enforce that the Python rules are being loaded through rules_python instead of used from builtins. This the same change as before, but with some internal fixes applied. PiperOrigin-RevId: 565113515 Change-Id: I999dbfaace8cce2168e718093fe418d548ab1b73 Partial commit for third_party/*, see #19472. Signed-off-by: Hee Cha <heec@google.com>
Member
|
This is now merged and the breakage has been fixed. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Instead of checking in a precompiled jar, following the example of #17112