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

Merged

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

jatgarg and others added 10 commits June 28, 2023 15:49
## Description

Clear snapshot from prefetch cache after 5s or on load. If we clear it
immediately then we will make a network call again to fetch this
snapshot which is redundant. So don't clear this cache immediately. We
also clear it once it is used.

---------

Co-authored-by: Jatin Garg <jatingarg@Jatins-MacBook-Pro-2.local>
## Description
Implement a test script/harness (i.e. something we can run with npm run
test, that spins up the browser, opens the browser's Devtools panel, and
lets us do checks in there (like opening the Fluid Devtools tab within
that panel, and checking that some elements are present there).


[AB#4635](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/4635)


## Sample
> npm run test:e2e



https://github.com/microsoft/FluidFramework/assets/114451900/7aa0c92a-ad22-4779-8dae-01f40d7cbb95
## Description
Deprecate serviceConfiguration - This property is redundant, and is
unused by the runtime. The same information can be found via
`deltaManager.serviceConfiguration` on this object if it is necessary.

---------

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

Expose an api in odsp driver to take driver factory and resolved url and
expose the current join session info that is stored in non persistent
cache for that document. This was a request from trello component folks,
so that they can know about that push session.

---------

Co-authored-by: Jatin Garg <jatingarg@Jatins-MacBook-Pro-2.local>
- Expand default config for webpack config file to other file names and
*.cjs extension
- Import the config file and use it to detect change (instead of assuming all the webpack.*.js files, which might not be enough since the config can "require" another file that is of different name)
- Add the lock file hash to detect changes to tools/plugin and source
versions.
- Adds a `generate:upcoming` script to the root package.json to generate
the UPCOMING.md file from changesets.
- Generation is also run implicitly when adding a changeset.
- Runs the generate task as a "check" in the client release group. This
is a quick and dirty way to get some CI enforcement. If the task updates
the file, then the "no extraneous edits" task will fail.
- Upgrades build-tools to the latest prerelease.

Closes
[AB#3976](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/3976).
…ty pipeline (#16171)

[AB#4778](https://dev.azure.com/fluidframework/internal/_workitems/edit/4778)

This PR aims to resolve the recent failures encountered in the Test
Stability pipelines. The key changes included are as follows:

1. Sync the `taskLint` section with that in CI build pipeline YAML file

2. Validate the existence of tinylicious log file before proceeding to
publish it as an artifact

The updates were tested on my personal [test
branch](https://github.com/microsoft/FluidFramework/tree/test/clarenceli)
with reducing the count of test stages.

The test pipeline run:
https://dev.azure.com/fluidframework/internal/_build/results?buildId=171253&view=results

The run after I broke an e2e test intentionally, where 3 different
artifacts should exist:
https://dev.azure.com/fluidframework/internal/_build/results?buildId=171246&view=results
…16074)

1. Accepting QuorumProposals moves up to Container.
2. Rename CollabWindowTracker to NoopHeuristic, as well as a few member methods.
3. NoopHeuristic becomes an event emitter and no longer calls submit directly.
## Description

This changes the local peer branches in the EditManager to be tracked by
`SharedTreeBranches` rather than just head commits. This allows for some
minor simplifications of the code in EditManager.
`SharedTreeBranch.rebaseOnto` has been updated with an `upTo` parameter
to accommodate the peer branch behavior.
@msfluid-bot msfluid-bot requested review from a team as code owners July 4, 2023 17:01
@github-actions github-actions bot added area: build Build related issues area: dds Issues related to distributed data structures area: dds: tree area: driver Driver related issues area: loader Loader related issues labels Jul 4, 2023
@github-actions github-actions bot added area: odsp-driver area: runtime Runtime related issues breaking change This PR or issue would introduce a breaking change 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 4, 2023
@msfluid-bot
Copy link
Collaborator Author

msfluid-bot commented Jul 4, 2023

@fluid-example/bundle-size-tests: +144 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 431.7 KB 431.71 KB +6 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 232.13 KB 232.13 KB +2 Bytes
loader.js 147.89 KB 147.81 KB -84 Bytes
map.js 44.88 KB 44.88 KB +2 Bytes
matrix.js 137.37 KB 137.37 KB +2 Bytes
odspDriver.js 87.41 KB 87.68 KB +272 Bytes
odspPrefetchSnapshot.js 41.1 KB 41.12 KB +24 Bytes
sharedString.js 153.24 KB 153.24 KB +2 Bytes
sharedTree2.js 240.08 KB 240.03 KB -60 Bytes
Total Size 1.63 MB 1.63 MB +144 Bytes

Baseline commit: 3998d03

Generated by 🚫 dangerJS against 7b706e4

@tylerbutler
Copy link
Member

hey @tylerbutler, do you know how to fix this CI failure: dev.azure.com/fluidframework/public/_build/results?buildId=172516&view=logs&j=eefa678c-f484-5837-78d3-627f1635913b&t=1ba7edfd-c88d-5668-3dbf-3a1b3166c15c?

Hmmmm... I may need to patch the flub generate upcoming command. I'll think about this some more and try to make a fix later today.

@tylerbutler tylerbutler force-pushed the main-next-8c638ee2e5850de4a403ffc88ef7cbfb10f75f08 branch from eec27d6 to 7b706e4 Compare July 6, 2023 16:57
@tylerbutler
Copy link
Member

@sonalideshpandemsft I think I was able to fix it without a code change. There are some invalid changesets in next, so I made some minor fixes to those; this should unblock it.

@sonalideshpandemsft sonalideshpandemsft merged commit 7b706e4 into next Jul 6, 2023
29 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-8c638ee2e5850de4a403ffc88ef7cbfb10f75f08 branch July 6, 2023 17:47
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: tree area: dds Issues related to distributed data structures area: driver Driver related issues area: loader Loader related issues area: odsp-driver area: runtime Runtime related issues base: next PRs targeted against next branch breaking change This PR or issue would introduce a breaking change 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.