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

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

ghoshkaj and others added 5 commits August 19, 2022 10:31
…#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>
@yann-achard-MS
Copy link
Contributor

Actively working on it

@github-actions 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
@github-actions github-actions bot added the base: next PRs targeted against next branch label Aug 22, 2022
@sonalivdeshpande
Copy link
Contributor

thank you @yann-achard-MS!!

@msfluid-bot
Copy link
Collaborator

@fluid-example/bundle-size-tests: +15.52 KB
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 392.45 KB 394.09 KB +1.64 KB
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 191.92 KB 197.48 KB +5.55 KB
loader.js 151.12 KB 151.06 KB -57 Bytes
map.js 42.63 KB 47.38 KB +4.75 KB
matrix.js 131.63 KB 134.3 KB +2.67 KB
odspDriver.js 150.23 KB 150.11 KB -127 Bytes
odspPrefetchSnapshot.js 38.39 KB 38.35 KB -41 Bytes
sharedString.js 152.42 KB 153.54 KB +1.12 KB
Total Size 1.25 MB 1.27 MB +15.52 KB

Baseline commit: cbb9ed6

Generated by 🚫 dangerJS against cf8fcec

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants