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

Jump to bottom

Automation: Main Next Integrate #11762

Merged
merged 6 commits into from Aug 31, 2022
Merged

Automation: Main Next Integrate #11762

merged 6 commits into from Aug 31, 2022

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

yann-achard-MS and others added 6 commits August 29, 2022 10:58
@yann-achard-MS @alex-pardes
More EditManager testing (#11680)
2004bac 
* Verify returned deltas

* Tweaks

* Check anchor intentions

* Move anchor state out of TestChangeRebaser

* Apply suggestions from code review

Co-authored-by: alex-pardes <105307164+alex-pardes@users.noreply.github.com>

* Comment on asDelta

* Remove dependence on EditManager for test input

Co-authored-by: alex-pardes <105307164+alex-pardes@users.noreply.github.com>
@GaryWilber
Fix for 2 deli edge cases (#11702)
a6fadd6
@znewton
r11s: session stickiness logic fix (#11712)
89943fa
@tylerbutler
Enable api reporting for build-cli (#11714)
2acd30b
@alexvy86
Update lockfile (#11710)
6f0b021
@tylerbutler
Start running build-cli tests in CI (#11713)
b97e90f
@github-actions github-actions bot requested review from msfluid-bot and a team as code owners August 31, 2022 22:10
@msfluid-bot
Copy link
Collaborator

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

Generated by 🚫 dangerJS against b97e90f

@sonalivdeshpande sonalivdeshpande merged commit 2ccb95a into next Aug 31, 2022
@sonalivdeshpande sonalivdeshpande deleted the main-next-b97e90f4d5cd40eee10d5cb630b0bc6cb26b00ae branch August 31, 2022 23:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sonalivdeshpande sonalivdeshpande sonalivdeshpande approved these changes

@msfluid-bot msfluid-bot Awaiting requested review from msfluid-bot msfluid-bot is a code owner

@tylerbutler tylerbutler Awaiting requested review from tylerbutler

Assignees

@tylerbutler tylerbutler

Labels
do-not-squash-merge main-next-integrate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@msfluid-bot @sonalivdeshpande @tylerbutler @yann-achard-MS @GaryWilber @znewton @alexvy86