Skip to content

build: apply angular bazel ng_module fix to unblock framework #19276

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

Conversation

devversion
Copy link
Member

Due to our weird cyclic dependency with the framework repository,
we need to apply changes from angular/angular#36971
before the PR can actually land in framework. This is because the
changes of that PR fail in the components repo job as we apply patches
that conflict with the new changes.

At the same time though, we cannot make the components repo compatible
until the framework PR landed. We work around this as usually done, by
applying the upstream changes through a patch. Then we can resolve
conflicts and the framework PR can land. Eventually we can then
remove the patch again from the components repo.

@devversion devversion added merge safe target: patch This PR is targeted for the next patch release labels May 7, 2020
@devversion devversion requested a review from a team as a code owner May 7, 2020 12:47
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label May 7, 2020
@devversion devversion added the P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent label May 7, 2020
@devversion devversion added the blocked This issue is blocked by some external factor, such as a prerequisite PR label May 7, 2020
@devversion
Copy link
Member Author

Marking as blocked temporarily until it's clear whether the framework PR will land or not.

Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

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

LGTM

@jelbourn jelbourn added the lgtm label May 7, 2020
Due to our weird cyclic dependency with the framework repository,
we need to apply changes from angular/angular#36971
before the PR can actually land in framework. This is because the
changes of that PR fail in the components repo job as we apply patches
that conflict with the new changes.

At the same time though, we cannot make the components repo compatible
until the framework PR landed. We work around this as usually done, by
applying the upstream changes through a patch. Then we can resolve
conflicts and the framework PR can land. Eventually we can then
remove the patch again from the components repo.
@devversion devversion force-pushed the build/prepare-ng-bazel-update branch from 693ed56 to 030609f Compare June 5, 2020 16:57
@devversion devversion added action: merge The PR is ready for merge by the caretaker and removed blocked This issue is blocked by some external factor, such as a prerequisite PR labels Jun 5, 2020
@devversion
Copy link
Member Author

Looks the PR is upstream now approved and we are good to go with landing this.. so that we can clean up things upstream in the ng_module rule (plus fix things for ng_package)

@andrewseguin andrewseguin merged commit c601a66 into angular:master Jun 9, 2020
andrewseguin pushed a commit that referenced this pull request Jun 9, 2020
Due to our weird cyclic dependency with the framework repository,
we need to apply changes from angular/angular#36971
before the PR can actually land in framework. This is because the
changes of that PR fail in the components repo job as we apply patches
that conflict with the new changes.

At the same time though, we cannot make the components repo compatible
until the framework PR landed. We work around this as usually done, by
applying the upstream changes through a patch. Then we can resolve
conflicts and the framework PR can land. Eventually we can then
remove the patch again from the components repo.
@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 Jul 10, 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 P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent 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