-
Notifications
You must be signed in to change notification settings - Fork 535
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 #11621
Merged
sonalivdeshpande
merged 6 commits into
next
from
main-next-cbb9ed6b822e10b4be534ce7ccf2eee8bdc83e3c
Aug 22, 2022
Merged
Automation: Main Next Integrate #11621
sonalivdeshpande
merged 6 commits into
next
from
main-next-cbb9ed6b822e10b4be534ce7ccf2eee8bdc83e3c
Aug 22, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…#11601) * update deployment details with updated helm chart versions and values * Update server/routerlicious/kubernetes/README.md Co-authored-by: Alex Villarreal <716334+alexvy86@users.noreply.github.com> * add a note about the optional key value pairs Co-authored-by: Alex Villarreal <716334+alexvy86@users.noreply.github.com>
* Add timeAwait to print the detailed error message * use timeout param * use 1999 ms as timeout threshold instead * Revert "use 1999 ms as timeout threshold instead" This reverts commit 90ced9c. * reused the timeout * Adjust timeout value for individual tests
* Fixes and tests * Simplify verification code * Remove invalid expectation that seq numbers are sequential * Lint * Comment out helper code * Apply suggestions from code review Co-authored-by: alex-pardes <105307164+alex-pardes@users.noreply.github.com> * seqNumber monotonicity check * Don't reuse short codes manually Co-authored-by: alex-pardes <105307164+alex-pardes@users.noreply.github.com>
* First test * More tests and fixes * Reorg tests * More tests and fixes * Tests and fixes * fixes * First version of compose * Tweak names * Remove test change rebaser dependency on SeqNumber * Introduce ChangesetTag * First draft of invert * Fixes and tests for invert * Add op IDs to set value marks * invert: test nested changes * Get back to passing invert and compose * rebase test cases * rename "total" -> "base" * First draft of rebase * Remove reset value test code * Support for rebasing revive over stuff * Support rebasing over revive * Reuse test utility functions * Fix compose bug and add coverage * Add tests for revive in compose * Make compose not return empty fields, lists, or modify * Prevent splitting of contiguous marks in rebase * Renames * Mark list factory fix & test * Use MarkListFactory in compose * Rename tombs -> tomb * Skip tests that cannot be completed right now * More thorough testing * Avoid using DUMMY_INVERT_TAG everywhere * Doc comments * Update doc comments. * Return single change on compose of one change * Remove ValueMark alias * Remove `Sequenced` format and update naming of some fields from `seq` to `change` * Refactor MarkListFactory code * PR feedback for utilities * Use mark helpers instead of typeof * PR feedback on utils * Make composeMarks return T.Mark * Grammar * Reduce exports from inverse implementation * simplify foldInFieldMarks * PR cleanup with Alex (part1) * Remove unnecessary check * Address most feedback on compose * StackyIterator * Minor tweaks * Address feedback on invert * Address rebase feedback * lint * Use StackyIterator in rebase * Apply suggestions from code review Co-authored-by: alex-pardes <105307164+alex-pardes@users.noreply.github.com> * Tabs -> spaces Co-authored-by: alex-pardes <105307164+alex-pardes@users.noreply.github.com>
Actively working on it |
github-actions
bot
added
area: dds
Issues related to distributed data structures
area: server
Server related issues (routerlicious)
area: tests
Tests to add, test infrastructure improvements, etc
labels
Aug 22, 2022
thank you @yann-achard-MS!! |
⯅ @fluid-example/bundle-size-tests: +15.52 KB
Baseline commit: cbb9ed6 |
sonalivdeshpande
approved these changes
Aug 22, 2022
sonalivdeshpande
deleted the
main-next-cbb9ed6b822e10b4be534ce7ccf2eee8bdc83e3c
branch
August 22, 2022 23:08
This was referenced Nov 4, 2022
This was referenced Nov 5, 2022
This was referenced Nov 5, 2022
This was referenced Nov 5, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area: dds
Issues related to distributed data structures
area: server
Server related issues (routerlicious)
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
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).