Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix worker and multiplex workers for DexBuilder and Desugar actions #17351

Conversation

Bencodes
Copy link
Contributor

@Bencodes Bencodes commented Jan 27, 2023

Fixing up the DexBuilder and Desugar actions so that they correctly spawn worker or multiplexed worker actions. --modify_execution_info doesn't work as expected and is not additive, which results in the previous execution infos being removed.

@sgowroji sgowroji added team-Android Issues for Android team awaiting-review PR is awaiting review from an assigned reviewer labels Jan 28, 2023
@Bencodes Bencodes force-pushed the add-asserts-to-test_persistent_multiplex_desugaring branch from b0426f4 to 16379d7 Compare January 30, 2023 18:29
@Bencodes Bencodes force-pushed the add-asserts-to-test_persistent_multiplex_desugaring branch from 16379d7 to 939a81d Compare March 1, 2023 23:15
@Bencodes Bencodes requested a review from lberki as a code owner March 1, 2023 23:15
@Bencodes Bencodes changed the title Add multiplex worker assertions for desugaring Fix worker and multiplex workers for DexBuilder and Desugar actions Mar 1, 2023
@Bencodes Bencodes force-pushed the add-asserts-to-test_persistent_multiplex_desugaring branch 2 times, most recently from ff9594e to 0ef0089 Compare March 2, 2023 00:15
@Bencodes Bencodes force-pushed the add-asserts-to-test_persistent_multiplex_desugaring branch from 0ef0089 to 03bfcbb Compare March 2, 2023 15:52
Copy link
Contributor

@ted-xie ted-xie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one minor nit that we can fix internally: there's a comment alluding to the new-deleted flag use_workers_with_bexbuilder at https://github.com/bazelbuild/bazel/blob/master/tools/android/BUILD.tools#L51 that we'll want to delete. Otherwise LGTM. Thanks, Ben!

@ted-xie ted-xie added awaiting-PR-merge PR has been approved by a reviewer and is ready to be merge internally and removed team-Android Issues for Android team awaiting-review PR is awaiting review from an assigned reviewer labels Apr 3, 2023
@Bencodes
Copy link
Contributor Author

Bencodes commented Apr 4, 2023

Opened up a cherry pick here for when this lands in master #17965

@sgowroji sgowroji added the team-Android Issues for Android team label Apr 4, 2023
@ted-xie ted-xie added awaiting-user-response Awaiting a response from the author and removed awaiting-PR-merge PR has been approved by a reviewer and is ready to be merge internally labels Apr 4, 2023
Copy link
Contributor

@ted-xie ted-xie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall LGTM, there is just one more thing to fix (that we can handle internally) - we'll have to move the deprecated @Option stanza from BazelBuildGraveyardOptions class to the BuildGraveyardOptions class.

@sgowroji sgowroji removed the awaiting-user-response Awaiting a response from the author label Apr 12, 2023
@Bencodes Bencodes deleted the add-asserts-to-test_persistent_multiplex_desugaring branch April 19, 2023 20:41
@keertk
Copy link
Member

keertk commented Apr 19, 2023

@bazel-io fork 6.2.0

fweikert pushed a commit to fweikert/bazel that referenced this pull request May 25, 2023
Fixing up the DexBuilder and Desugar actions so that they correctly spawn worker or multiplexed worker actions. `--modify_execution_info` doesn't work as expected and is not additive, which results in the previous execution infos being removed.

Closes bazelbuild#17351.

PiperOrigin-RevId: 523696356
Change-Id: Iada7fb75df5b4d2e3ba1308110977899567f2bc2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team-Android Issues for Android team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants