Skip to content

Conversation

@devversion
Copy link
Member

@devversion devversion commented Feb 27, 2023

It conflicted because we updated to v16 in main but not in 15.2.x. Ideally the update would land in patch too, to avoid such conflicts, but that's a discussion where we never got a good conclusion on.

In framework I think we are updating devkit/AIO deps also for the patch branch, always following the @next NPM tag. Any thoughts here @crisbeto? (notice how dev-infra already uses v16 too- so we have a mismatch now)

@devversion devversion added the target: patch This PR is targeted for the next patch release label Feb 27, 2023
@devversion devversion requested a review from crisbeto February 27, 2023 13:28
@angular-robot angular-robot bot added the area: build & ci Related the build and CI infrastructure of the project label Feb 27, 2023
@crisbeto
Copy link
Member

We could cherry-pick the v16 update to the 15.2.x branch as well, as long as it doesn't affect the peer dependency in the package.json that is published to npm (I don't think it does). I'm also okay with just merging this change, but I could imagine it coming up again.

@devversion
Copy link
Member Author

@crisbeto Updated to cherry-pick v16 update, so the dev-infra update just applies cleanly (and future updates 👍 )

@devversion
Copy link
Member Author

hmm. I think we would use this version of Angular for the partial compilation output. I don't fully recall how this would affect our compatibility, but as long as partial compilation output is still backwards compatible (which seems to be the case), we should be good. Also the partial compilation output has a minVersion IIRC.

@devversion
Copy link
Member Author

devversion commented Feb 27, 2023

I've discussed with Alan as well a bit. Capturing the conclusion here: It's more correct to not update v16 in the patch branch.

Positives:

  • No diff between patch + main. Easier Renovate updates
  • No mismatch because dev-infra might already be ahead using v16. Although the dev-infra angular deps are a noop though because Bazel rules will always use the workspace version.

Downsides

  • Changes landing in patch, might break in v15. e.g. update recorder changes like ci: remove NG_UPDATE_BUFFER_V2 tests #26700
  • Library support guarantees: If library is built with M (major segment), then it supports M, M+1 guaranteed. Not M-1

Long-term solution would be to run Renovate on both patch + main. I will revert back to be on the safe side for now.

@devversion devversion merged commit c324289 into angular:15.2.x Feb 27, 2023
@devversion devversion deleted the patch-port-dev-infra branch February 27, 2023 14:00
@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 Mar 30, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area: build & ci Related the build and CI infrastructure of the project target: patch This PR is targeted for the next patch release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants