Skip to content

build: add try/catch to @angular/bazel ng_module patch #18985

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

Merged
merged 1 commit into from
Apr 6, 2020

Conversation

gregmagolan
Copy link
Contributor

Navigating the angular/angular & angular/components dependency sandwich.

Navigating the angular/angular & angular/components dependency sandwich.
@gregmagolan gregmagolan requested a review from a team as a code owner April 3, 2020 21:25
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Apr 3, 2020
Copy link
Member

@devversion devversion left a comment

Choose a reason for hiding this comment

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

We should explore if we can simplify this process in the future.

@devversion devversion added lgtm action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release labels Apr 3, 2020
try {
// Temporary patch pre-req for https://github.com/angular/angular/pull/36333.
// Can be removed once @angular/bazel is updated here to include this patch.
// try/catch needed for this the material CI tests to work in angular/repo
Copy link
Member

Choose a reason for hiding this comment

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

Could you elaborate more on the specifics of why the try-catch is necessary?

Copy link
Contributor Author

@gregmagolan gregmagolan Apr 4, 2020

Choose a reason for hiding this comment

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

The patch fails to apply in the angular repo for some reason so the try/catch is needed to make angular/angular#36333 green.

@devversion Do you remember the specifics? I've put this in once before to manage the dependency sandwich but can't recall what the underlying mechanics are of the patch failing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh. I think I sorted it out in my head. The patch is applied cleanly in the components repo as it is applied to the last released @angular/bazel. However, in the angular repo. the patch is applied to the head @angular/bazel, which in the PR that change is actually made and where the components repo has to be updated to be green, the patch is applied to an @angular/bazel package that already has the changes in the patch. So it fails to apply and it will take the catch() code path.

Copy link
Member

Choose a reason for hiding this comment

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

Yep. Can confirm that this is why we need the try/catch.

@mmalerba mmalerba merged commit bf2c910 into angular:master Apr 6, 2020
mmalerba pushed a commit that referenced this pull request Apr 14, 2020
Navigating the angular/angular & angular/components dependency sandwich.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators May 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants