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

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

alexvy86 and others added 5 commits August 26, 2022 12:43
* New npm scripts to run perf-tests
* New tool to process perf test output files
* Pipeline to run perf benchmarks and send metrics to Kusto
* Update dependencies on @fluid-tools/benchmark to 0.42.0
* Attempt to address AB 357
- benchmark() and benchmarkMemory() now automatically tag tests with @ExecutionTime or @MemoryUsage, respectively, to allow for selective execution.
- Ability to add a user-specified category to tests, for selective execution.

Specifically for memory tests:
- Ability to define a percentage of samples to use when computing statistics. If not set to 1 (100%), the lowest and highest samples are dropped, and statistics are only computed from the remaining ones.
- Print the computed statistics to the output file when using the custom mocha reporter.
- Unit tests for function that computes statistics.
This change adds tests for the generate buildVersion CLI command and updates the code so that it reads environment variables correctly.
* Fix gc dataStore no duplicate routes test
@tyler-cai-microsoft
Copy link
Contributor

@NicholasCouri it looks like your changes have caused a merge conflict, I don't have the context to exactly resolve the conflicts, granted it looks somewhat straight forward.

@github-actions github-actions bot added area: build Build related issues area: dds Issues related to distributed data structures 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 labels Aug 30, 2022
@github-actions github-actions bot added the base: next PRs targeted against next branch label Aug 30, 2022
@NicholasCouri
Copy link
Contributor

Status: looking at the build failure.

@msfluid-bot
Copy link
Collaborator

@fluid-example/bundle-size-tests: +14.87 KB
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 391.83 KB 392.81 KB +1011 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 191.3 KB 195.53 KB +4.23 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.98 KB +3.35 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 154.2 KB +1.77 KB
Total Size 1.25 MB 1.27 MB +14.87 KB

Baseline commit: 6243a43

Generated by 🚫 dangerJS against 1eefc10

@NicholasCouri NicholasCouri self-requested a review August 30, 2022 20:29
Copy link
Contributor

@tyler-cai-microsoft tyler-cai-microsoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sonalivdeshpande sonalivdeshpande merged commit 8b1c38d into next Aug 30, 2022
@sonalivdeshpande sonalivdeshpande deleted the main-next-6243a439ab0e7153ae574b947ab7004bc3001d7f branch August 30, 2022 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: build Build related issues area: dds Issues related to distributed data structures area: runtime Runtime related issues area: tests Tests to add, test infrastructure improvements, etc base: next PRs targeted against next branch community-contribution 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
Development

Successfully merging this pull request may close these issues.

None yet

6 participants