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 #18464

Merged
merged 2 commits into from
Nov 23, 2023
Merged

Automation: main-next integrate #18464

merged 2 commits into from
Nov 23, 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-e373070 into the target branch, next. The direction of the merge matters! You need to checkout next and merge main-next-e373070 into it, then fast-forward main-next-e373070 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-e373070 -- merge next into main-next-e373070
  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-e373070 branch to the merge commit and push to the remote.
  • git checkout main-next-e373070 -- 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.

…18375)

Bumped client from 2.0.0-internal.7.3.0 to 2.0.0-internal.7.4.0.

Co-authored-by: System Administrator <[email protected]>
@sonalideshpandemsft
Copy link
Contributor

sonalideshpandemsft commented Nov 23, 2023

ack. accepted all changes from next since this was a minor release

@msfluid-bot
Copy link
Collaborator Author

@fluid-example/bundle-size-tests: +14 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 452.67 KB 452.68 KB +2 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 239.61 KB 239.61 KB No change
loader.js 165.09 KB 165.09 KB +2 Bytes
map.js 47.39 KB 47.39 KB +2 Bytes
matrix.js 147.36 KB 147.36 KB +2 Bytes
odspDriver.js 90.35 KB 90.35 KB +2 Bytes
odspPrefetchSnapshot.js 41.82 KB 41.82 KB +2 Bytes
sharedString.js 168.26 KB 168.26 KB No change
sharedTree2.js 274.42 KB 274.42 KB No change
Total Size 1.74 MB 1.74 MB +14 Bytes

Baseline commit: 1fcfe94

Generated by 🚫 dangerJS against baebace

@sonalideshpandemsft sonalideshpandemsft merged commit baebace into next Nov 23, 2023
24 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-e373070 branch November 23, 2023 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants