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

Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 1, 2022

Main-next integrate PR

The aim of this pull request is to sync main and next branch. The expectation from the assignee is as follows:

  • Acknowledge the pull request by adding a comment -- "Actively working on it".
  • Resolve any merge conflicts between this branch and next (and push the resolution to this branch). Merge next into this branch if needed. Do NOT rebase or squash this branch: its history must be preserved.
  • Ensure CI is passing for this PR, fixing any issues. Please don't look into resolving Real service e2e test and Stress test failures as they are non-required CI failures.
  • Once the PR is ready for merge, please add a comment @mentioning the reviewers to get this PR merged in. Thank you!!

For more information about how to resolve merge conflicts and CI failures, visit [this wiki page]
(https://github.com/microsoft/FluidFramework/wiki/Main-next-Automation).

Josmithr and others added 5 commits August 30, 2022 11:42
#11686)

`@fluidframework/counter` is now promoted more directly on our website, including its API docs. This PR is aimed at cleaning up those docs for public consumption.

Mostly simple typo fixes and capitalization/punctuation improvements. But it also moves `SharedCounter`'s summary docs away from using embedded Markdown syntax (which is not supported) toward using `@example` tag syntax for its flow examples.
Fix AB 1633 Summary Upload Error
…ors (Some batching improvements part 2) (#11579)

This used to be driven by two asserts (0x170 and 0x16f) but the change makes the situation more explicit by closing the container and not relying on the exception handler of who's using the PendingStateManager. And also adds more information to the error.
@CraigMacomber
Copy link
Contributor

"Actively working on it"

@CraigMacomber
Copy link
Contributor

Conflict is in packages/runtime/container-runtime/src/test/pendingStateManager.spec.ts . Looks like @andre4i would be the best contact for resolving it.

@github-actions github-actions bot added area: build Build related issues area: dds Issues related to distributed data structures area: runtime Runtime related issues area: tests Tests to add, test infrastructure improvements, etc public api change Changes to a public API labels Sep 1, 2022
@github-actions github-actions bot added the base: next PRs targeted against next branch label Sep 1, 2022
@alexvy86
Copy link
Contributor

alexvy86 commented Sep 1, 2022

Also, the failed Performance benchmarks check can be ignored, I looked at it and it's because this commit doesn't include a fix for that pipeline definition which is already in main. One of the upcoming main-next integration PRs should take care of that.

@andre4i
Copy link
Contributor

andre4i commented Sep 1, 2022

Working on the test failures. Will update the branch accordingly.

@msfluid-bot
Copy link
Collaborator

Could not find a usable baseline build with search starting at CI ea3f118

Generated by 🚫 dangerJS against 7e866ca

@sonalivdeshpande
Copy link
Contributor

PR checks passed. merging it.

thanks @CraigMacomber, @andre4i, @alexvy86!!

@sonalivdeshpande sonalivdeshpande merged commit 033e345 into next Sep 1, 2022
@sonalivdeshpande sonalivdeshpande deleted the main-next-ea3f1188f124a34b98e8e8658bb7f1c9623137fb branch September 1, 2022 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: build Build related issues area: dds Issues related to distributed data structures area: runtime Runtime related issues area: tests Tests to add, test infrastructure improvements, etc base: next PRs targeted against next branch community-contribution do-not-squash-merge main-next-integrate public api change Changes to a public API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants