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

Automation: main-next integrate #18518

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Automation: main-next integrate #18518

merged 2 commits into from
Nov 29, 2023

Conversation

msfluid-bot
Copy link
Collaborator

main-next integrate PR

DO NOT MERGE THIS PR USING THE GITHUB UI.

The aim of this pull request is to sync main and next branch. This branch has MERGE CONFLICTS with next due to this commit. If this PR is assigned to you, you need to do the following:

  1. Acknowledge the pull request by adding a comment -- "Actively working on it".
  2. Merge main-next-fd0c954 into the target branch, next. The direction of the merge matters! You need to checkout next and merge main-next-fd0c954 into it, then fast-forward main-next-fd0c954 to the merge commit. To do that use the following git commands:
  • git fetch --all -- this ensures your remote refs are updated
  • git remote -v -- displays the list of remote repositories associated with your Git repository along with their corresponding URLs. You have to choose the remote associated with the microsoft/FluidFramework repository. Change the remote name in these example commands if yours is not upstream.
  • git checkout -b next-merge-head upstream/next -- make a temporary branch at next.
  • git merge upstream/main-next-fd0c954 -- merge next into main-next-fd0c954
  1. Resolve any merge conflicts between the branches, then commit all the changes using the following commands:
  • git add . -- stage all the local changes
  • git commit -m "Automation: main-next integrate" -- commit the merge
  1. Fast-forward the main-next-fd0c954 branch to the merge commit and push to the remote.
  • git checkout main-next-fd0c954 -- check out the mergeBranch locally
  • git merge next-merge-head --ff-only -- fast-forward to the merge commit
  • git push upstream -- and push it to upstream (your upstream remote name may be different)
  1. Address any CI failures. If you need to make additional changes to the PR, always amend the commit using the following git commands:
  • git commit --amend -m "Automation: main-next integrate"
  • git push --force-with-lease

Once CI passes and the PR is ready to merge, add the "msftbot: merge-next" label to the PR and one of the people with merge permissions will merge it in.

## Description

Regenerate root/client package lock.
This reveled that the patch to engine.io-client that we are applying has
been released and is no longer needed, so that patch has been removed.

This also cleans up some cruft from before
#18486 removing an old
eslint package which allows client's deps to be installed with NodeJS
20.
@kian-thompson
Copy link
Contributor

Actively working on it. I need some changes from main to unblock my work.

@msfluid-bot
Copy link
Collaborator Author

@fluid-example/bundle-size-tests: +2.42 KB
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 452.5 KB 452.5 KB -5 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 239.28 KB 239.28 KB No change
loader.js 165.03 KB 167.44 KB +2.41 KB
map.js 47.39 KB 47.38 KB -4 Bytes
matrix.js 145.34 KB 145.33 KB -4 Bytes
odspDriver.js 90.35 KB 90.36 KB +6 Bytes
odspPrefetchSnapshot.js 41.82 KB 41.82 KB No change
sharedString.js 166.14 KB 166.13 KB -6 Bytes
sharedTree2.js 283.52 KB 283.51 KB -7 Bytes
Total Size 1.75 MB 1.75 MB +2.42 KB

Baseline commit: 3774206

Generated by 🚫 dangerJS against 6479fee

Copy link
Contributor

This PR is ready to merge! Please review it and squash merge into next: @sonalideshpandemsft @tylerbutler @scottn12

@sonalideshpandemsft sonalideshpandemsft merged commit 6479fee into next Nov 29, 2023
27 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-fd0c954 branch November 29, 2023 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants