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

Closed
wants to merge 7 commits into from
Closed

Automation: main-next integrate #17467

wants to merge 7 commits into from

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-664cd6b 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-664cd6b 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

Josmithr and others added 7 commits September 21, 2023 17:39
@Josmithr
fix(api-markdown-documenter): Don't render HTML multiline in Markdown…
bd058e4 
… tables (#17430)

Fixes issue where HTML content being rendered inside of a Markdown table
was being rendered across multiple lines, which is invalid Markdown
syntax.

An example of how this might have appeared previously:

```md
| Col 1 | Col 2 |
| --- | --- |
| <p>
Some content
</p>
| Hello world |
```

Correct rendering:
```md
| Col 1 | Col 2 |
| --- | --- |
| <p>Some content</p> | Hello world |
```

The fix was to ensure no "pretty" formatting is used when rendering HTML
content under a Markdown table context.

The changes include adding the ability to opt out of pretty formatting
in the HTML renderer. Note: this degree of freedom has not yet been
added to the public API for the HTML renderer.

This PR also updates the test suite to reproduce the situation.

Finally, this PR fixes a small bug in "pretty" HTML rendering where
`</section>` (closing) tags were not being line-wrapped correctly.
@dannimad
Offline reload when having stashed blobs. (#17417)
8ffc727 
Recent changes in the blob manager moved the stashed blobs processing
while loading the container runtime. This change was made because we
don't want to block other ops on waiting for blob uploads when there is
a reconnection. However, this doesn't allow containers to resolve
offline when there is a stashed blob. This PR brings back the block we
had on reconnection, but it will only happen on loading (not in every
reconnection).


[AB#5523](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/5523)
@alexvy86
fix(fluid-build): Pass env vars to child processes (#17440)
93f8f89
@tyler-cai-microsoft
Refactor refresh latest summary ack (#17185)
07aa7ee 
[AB#5417](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/5417)

Refactor refresh latest summary ack to close as that is the new
behavior. We will end execution of submit summary early at the base
stage.
@andre4i
Remove leader election from stress tests (#17443)
b29a94f 
## Description

For the past 7 days, this test has pushed a couple hundred thousand
events (millions in the past 30 days) to telemetry and none of them are
actionable (they are all FYIs and never caught by any alerts).
Meanwhile, we should be more frugal with the telemetry output of the
stress tests. If these are not actionable, they should be removed.

## **If this test is deemed vital, I suggest the code be resurrected,
the events sampled and converted into actual errors after testing it and
verifying it doesn't spam the logs with non-actionable events**
@ghoshkaj
fix (server): Fix broadcast-signal async call (#17446)
664cd6b 
An error got merged in with
#16451 -- the async call
in the broadcast-signal event emitter wasn't working. This PR fixes it.

#16452 is blocked on
this change being merged and released as a new package version.
@msfluid-bot
Automation: main-next integrate
300bd18
@msfluid-bot msfluid-bot requested review from a team as code owners September 25, 2023 21:41
@github-actions github-actions bot added the base: next PRs targeted against next branch label Sep 25, 2023
@msfluid-bot
Copy link
Collaborator Author

⯆ @fluid-example/bundle-size-tests: -64 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 444.21 KB 444.18 KB ⯆ -32 Bytes
connectionState.js 680 Bytes 680 Bytes ■ No change
containerRuntime.js 237.37 KB 237.34 KB ⯆ -32 Bytes
loader.js 148.17 KB 148.17 KB ■ No change
map.js 46.48 KB 46.48 KB ■ No change
matrix.js 140.23 KB 140.23 KB ■ No change
odspDriver.js 90.23 KB 90.23 KB ■ No change
odspPrefetchSnapshot.js 41.9 KB 41.9 KB ■ No change
sharedString.js 161.03 KB 161.03 KB ■ No change
sharedTree2.js 256.82 KB 256.82 KB ■ No change
Total Size 1.67 MB 1.67 MB ⯆ -64 Bytes

Baseline commit: f430900

Generated by 🚫 dangerJS against 300bd18

@sonalideshpandemsft
Copy link
Contributor

HEAD of next has changed again :(

@sonalideshpandemsft sonalideshpandemsft deleted the main-next-664cd6b branch September 25, 2023 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sonalideshpandemsft sonalideshpandemsft sonalideshpandemsft approved these changes

Assignees

@ghoshkaj ghoshkaj

Labels
base: next PRs targeted against next branch main-next-integrate merge-ok
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@msfluid-bot @sonalideshpandemsft @ghoshkaj @Josmithr @dannimad @alexvy86 @tyler-cai-microsoft @andre4i