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

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.

For more information about how to resolve merge conflicts and CI failures, visit this wiki page.

curtisman and others added 5 commits August 13, 2022 09:44
…n tests (#11526)

Fixes real service e2e tests targeting tinylicious error running in Windows due to port exhaustion. 

This should cover any node-fetch calls in both r11s and odsp drivers.
Additionally, closes websocket when asked to in Tinylicious.
* Improve partialLengths documentation and simplify where possible

* use iterator

* Remove unused import, fixing silent merge conflict

* WIP adjustments to partialLengths to track local info

* Still WIP changes, made more incremental though

* Add a test for corectness of recomputation

* remove unnecessary ts flag

* WIP improvement

* Bugfix for clearing segment on detached localRefs

* clean up some no longer accurate TODOs

* combine local state to one object to simplify undefined asserts

* Simplify query logic and add some documentation on strategy

* More misc cleanup

* Remove outdated comment

* Remove kludges relating to overlapping removed client ids

* Move slow-path computation to TestClient

* Various cleanup and lint fixes

* remove stray comment

* fix tests, implement caching for local overlap remove case

* update api report

* PR feedback

Co-authored-by: Abram Sanderson <absander@microsoft.com>
@ChumpChief
Copy link
Contributor

Working on it

@github-actions github-actions bot added base: next PRs targeted against next branch area: dds Issues related to distributed data structures area: examples Changes that focus on our examples area: runtime Runtime related issues area: server Server related issues (routerlicious) area: tests Tests to add, test infrastructure improvements, etc public api change Changes to a public API labels Aug 16, 2022
@ChumpChief
Copy link
Contributor

@Abe27342 @anthony-murphy FYI as the owners of the conflicting changes.

@ChumpChief
Copy link
Contributor

Rerunning, failures look unrelated. @sonalivdeshpande @tylerbutler I suspect this will be good to merge once it finishes.

@msfluid-bot
Copy link
Collaborator

@fluid-example/bundle-size-tests: +15.8 KB
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 392.36 KB 394.09 KB +1.74 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.7 KB 134.47 KB +2.77 KB
odspDriver.js 150.23 KB 150.11 KB -127 Bytes
odspPrefetchSnapshot.js 38.39 KB 38.35 KB -41 Bytes
sharedString.js 152.34 KB 153.55 KB +1.21 KB
Total Size 1.25 MB 1.27 MB +15.8 KB

Baseline commit: 26919c2

Generated by 🚫 dangerJS against 3d253c1

@sonalivdeshpande
Copy link
Contributor

sonalivdeshpande commented Aug 17, 2022

thank you @ChumpChief!!

@sonalivdeshpande sonalivdeshpande merged commit 9cef3e9 into next Aug 17, 2022
@sonalivdeshpande sonalivdeshpande deleted the main-next-26919c2622926d68a913d1bbc675df65ea19926a branch August 17, 2022 00:02
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: examples Changes that focus on our examples 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 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

8 participants