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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Jul 6, 2023
Merged

Automation: Main Next Integrate #16259

merged 11 commits into from
Jul 6, 2023

Conversation

msfluid-bot
Copy link
Collaborator

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

markfields and others added 10 commits June 29, 2023 13:17
@markfields
Summarizer: Rename setting to flight it to new code only (#16187)
a1c6c5f
@agarwal-navin
Add missing export SummaryStage introduced by #15988 (#16192)
3874a93 
#15988 added a type `SummaryStage` but it was not exported as expected.
This PR exports the missing symbol removing the warning in the
container-runtime.api.md file.
@jikim-msft
fix(devtools-view): Fix container typemetadata and metadata color on …
e61e7a2 
…hover (#16185)

#### Description

https://dev.azure.com/fluidframework/internal/_workitems/edit/4677/

<img width="666" alt="Screenshot 2023-06-29 at 10 46 05 AM"
src="https://github.com/microsoft/FluidFramework/assets/111468570/5e582009-d8a9-466c-9e32-ec960bcd2b93">

#### Change
- High contrast theme should only have `white` as its font color when
not hovered, and `black` when hovered over the row.
- Conditionally apply the color based on the `themeInfo.name`.
@Abe27342
Add backpressure to stress test runner load (#16196)
ea400d0 
## Description

Makes the stress test runner retry loop respect `ThrottlingError`s
thrown by waiting for the retryAfter duration before starting a new
container.

This should hopefully dramatically decrease the frequency of throttling
errors we see from odsp, which is currently the largest cause of
`RunnerFailed`.
@markfields
Stress Test Config: Adjust summarizer-based flights for stress tests (#…
fd559d6 
…16193)

We renamed the flight name to differentiate new v. old code in the
flight system (#16187). But I forgot to update the stress tests to use
the new flight value. Furthermore, we want to enable another setting in
tandem, so add that too.
@tylerbutler
build(bundle-size-tools): Remove unneeded @types (#16198)
c4519da 
The jszip package includes types, making the separate package
superfluous.
@tylerbutler
fix(upcoming): Don't output the changeset dates (#16204)
ccb3450 
The dates apparently can sometimes differ when running in CI. While we
figure out exactly what's happening, remove the date from the UPCOMING
output.
@jatgarg
Return the first consecutive sub block of ops for frs driver instead …
b5e1e29 
…of 0 ops on violation (#16172)

## Description

Item: https://dev.azure.com/fluidframework/internal/_workitems/edit/4668
When we fetch ops for frs through delta storage or through snapshot, it
could happen that the ops are not contiguous. In that case, return the
first set of contiguous ops so that we can make at least some progress.

It's an issue service needs to address, but this change is a temp
experiment to see if it mitigates issues for users while we are waiting
for proper fix.

---------

Co-authored-by: Jatin Garg <jatingarg@Jatins-MacBook-Pro-2.local>
@curtisman
Add tool version changes as incremental rebuild trigger (#16200)
d061f18 
For tsc, add a version check with the tsBuildInfo file to trigger
incremental rebuild trigger.
For the following tools, add the tool version in the done log files to
serve as an incremental rebuild trigger when it changes.
- api-extractor
- tslint
- eslint
- prettier

Fixes
[AB#4809](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/4809)
@tylerbutler
[bump] build-tools: 0.20.0 => 0.21.0 (minor) (#16209)
3a7bfcb 
Bumped build-tools from 0.20.0 to 0.21.0.

Commands used:

```shell
flub release -g build-tools
```
@msfluid-bot msfluid-bot requested review from a team as code owners July 6, 2023 17:49
@github-actions github-actions bot added area: build Build related issues area: driver Driver related issues area: runtime Runtime related issues area: tests Tests to add, test infrastructure improvements, etc dependencies Pull requests that update a dependency file public api change Changes to a public API base: next PRs targeted against next branch labels Jul 6, 2023
@msfluid-bot
Copy link
Collaborator Author

⯅ @fluid-example/bundle-size-tests: +178 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 431.7 KB 431.71 KB ⯅ +8 Bytes
connectionState.js 680 Bytes 680 Bytes ■ No change
containerRuntime.js 232.13 KB 232.13 KB ⯅ +4 Bytes
loader.js 147.81 KB 147.81 KB ⯅ +4 Bytes
map.js 44.88 KB 44.88 KB ⯅ +2 Bytes
matrix.js 137.37 KB 137.37 KB ⯅ +2 Bytes
odspDriver.js 87.67 KB 87.82 KB ⯅ +150 Bytes
odspPrefetchSnapshot.js 41.12 KB 41.12 KB ⯅ +4 Bytes
sharedString.js 153.24 KB 153.24 KB ⯅ +2 Bytes
sharedTree2.js 240.03 KB 240.03 KB ■ No change
Total Size 1.63 MB 1.63 MB ⯅ +178 Bytes

Baseline commit: 7b706e4

Generated by 🚫 dangerJS against 1fb4cb9

@sonalideshpandemsft sonalideshpandemsft merged commit 1fb4cb9 into next Jul 6, 2023
29 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-3a7bfcb7b8b53cf1b53a6f42a5dba296e9e89495 branch July 6, 2023 18:21
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

@scottn12 scottn12 Awaiting requested review from scottn12

@tylerbutler tylerbutler Awaiting requested review from tylerbutler

Assignees

@tylerbutler tylerbutler

Labels
area: build Build related issues area: driver Driver related issues area: runtime Runtime related issues area: tests Tests to add, test infrastructure improvements, etc base: next PRs targeted against next branch dependencies Pull requests that update a dependency file do-not-squash-merge main-next-integrate public api change Changes to a public API
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@msfluid-bot @sonalideshpandemsft @tylerbutler @markfields @agarwal-navin @jikim-msft @Abe27342 @jatgarg @curtisman