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

Merged

Conversation

github-actions[bot]
Copy link
Contributor

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).

scarlettjlee and others added 5 commits August 18, 2022 11:46
With `generateServiceSummary` enabled, scribe will generate a service summary when there no client to save the last pending ops and checkpoint states.  However, this can cause it to conflict if a new client joins and start summarizing, causing SummaryNack from mismatch parents.

This is impacting e2e test targeting t9s, so for now, disable it in t9s to stabilize the test.
[AB#1627](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/1627) is the follow up issue.

Pending build/publish a new tinylicious and update dependency before reenable the first for [AB#1454](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/1454)
Need to update tinylicious dependencies to non-release version before we can publish.
So use the opportunity to just update to the latest released versions.
* Add e2e test to demo use of flush mode

* override flush mode for azure clients

* disable new test for local driver

* PR feedback
@github-actions github-actions bot added area: build Build related issues area: dds Issues related to distributed data structures area: framework Framework is a tag for issues involving the developer framework. Eg Aqueduct area: runtime Runtime related issues area: server Server related issues (routerlicious) area: tests Tests to add, test infrastructure improvements, etc dependencies Pull requests that update a dependency file public api change Changes to a public API labels Aug 22, 2022
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: framework Framework is a tag for issues involving the developer framework. Eg Aqueduct area: runtime Runtime related issues area: server Server related issues (routerlicious) area: tests Tests to add, test infrastructure improvements, etc base: next PRs targeted against next branch community-contribution dependencies Pull requests that update a dependency file 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

7 participants