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

Merged
merged 6 commits into from Sep 2, 2022
Merged

Automation: Main Next Integrate #11785

merged 6 commits into from Sep 2, 2022

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

@github-actions github-actions bot requested review from msfluid-bot and a team as code owners September 1, 2022 20:13
@sonalivdeshpande
Copy link
Contributor

Conflicts seems to be coming from this commit: #11726

@ghoshkaj is looking into it.

@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: server Server related issues (routerlicious) area: tests Tests to add, test infrastructure improvements, etc dependencies Pull requests that update a dependency file base: next PRs targeted against next branch labels Sep 2, 2022
@msfluid-bot
Copy link
Collaborator

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

Generated by 🚫 dangerJS against f74bd51

@sonalivdeshpande
Copy link
Contributor

thanks @ghoshkaj!!

@sonalivdeshpande sonalivdeshpande merged commit 3df08c3 into next Sep 2, 2022
@sonalivdeshpande sonalivdeshpande deleted the main-next-30615beeaea71719d3a2e1910c2d71ac07f70b3f branch September 2, 2022 17:39
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

@sonalivdeshpande sonalivdeshpande

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: 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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@sonalivdeshpande @msfluid-bot @tylerbutler @ghoshkaj @taylorsw04 @ChumpChief