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

Merged
merged 6 commits into from
Jul 28, 2023
Merged

Automation: main-next integrate #16609

merged 6 commits into from
Jul 28, 2023

Conversation

msfluid-bot
Copy link
Collaborator

main-next integrate PR

The aim of this pull request is to sync main and next branch. If this PR is assigned to you, you need to do the following:

  1. Acknowledge the pull request by adding a comment -- "Actively working on it".
  2. If there are no CI failures, add the "msftbot: merge-next" label to the PR and one of the people with merge permissions will merge it in.
  3. If there are CI failures, check out the main-next-e9e63b8 branch and make code changes to fix the failures.
  • You can ignore any failures in the Real service e2e test and Stress test pipelines. These pipelines are not required to pass to merge changes.
  1. Do NOT rebase or squash the main-next-e9e63b8 branch: its history must be preserved. Always amend the HEAD commit using the following git commands:
  • git commit --amend -m "Automation: main-next integrate"
  • git push --force-with-lease

alexvy86 and others added 6 commits July 26, 2023 14:50
This change ensures we won't fail the pipeline if the bundle comparison
task fails:

https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema/steps-task?view=azure-pipelines

---------

Co-authored-by: Tony Murphy <anthonm@microsoft.com>
## Description

This PR adds more complex move tests to the file `editing.spec.ts`

Co-authored-by: Yann Achard <achardy@microsoft.com>
…data store (#16578)

## Description

`SharedDirectory` was using `-1` all the time for locally created
subdirectories.
This leads to bugs when considering the logic in
`isMessageForCurrentInstanceOfSubDirectory` when the `SharedDirectory`
is additionally detached: no ack op will ever be received for that
subdir (since an op is never sent), but clients who load using the
attachment summary may start sending ops which refers to the same
subdirectory.

merge-tree has a similar problem which is resolved by using `-1` or `0`
depending on the attach state of the DDS, see `UnassignedSequenceNumber`
vs `UniversalSequenceNumber`. The fix here brings SharedDirectory
handling closer to merge-tree's.
@msfluid-bot
Copy link
Collaborator Author

@fluid-example/bundle-size-tests: +70 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 435.32 KB 435.4 KB +86 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 235.42 KB 235.42 KB No change
loader.js 145.75 KB 145.75 KB No change
map.js 45.98 KB 45.98 KB No change
matrix.js 138.31 KB 138.31 KB No change
odspDriver.js 88.62 KB 88.62 KB No change
odspPrefetchSnapshot.js 41.55 KB 41.55 KB No change
sharedString.js 154.82 KB 154.82 KB No change
sharedTree2.js NaN undefined NaN undefined No change
Total Size 1.64 MB 1.64 MB +70 Bytes

Baseline commit: b20a44c

Generated by 🚫 dangerJS against ac64c1f

@sonalideshpandemsft sonalideshpandemsft merged commit ac64c1f into next Jul 28, 2023
39 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-e9e63b8 branch July 28, 2023 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
base: next PRs targeted against next branch main-next-integrate merge-ok
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants