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

Merged
merged 6 commits into from
Jul 18, 2023
Merged

Automation: main-next integrate #16417

merged 6 commits into from
Jul 18, 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:

  • Acknowledge the pull request by adding a comment -- "Actively working on it".
  • Resolve any CI failures between main-next-9fbaa3b and next and push the results to upstream. Do NOT rebase or squash this branch: its history must be preserved.
  • Address any CI failures. Ignore any Real service e2e test and Stress test failures because they are non-required CI workflows.
  • Recommended git commands:
    • git checkout main-next-9fbaa3b -- check out the PR branch.
    • FIX ANY CI FAILURES
    • git commit --amend -m Automation: main-next integrate
    • git push --force-with-lease

jenn-le and others added 6 commits July 11, 2023 15:05
@jenn-le @noencke
feat(tree): Expose revertible event (#16293)
b11d3a6 
## Description

This emits a "revertible" event when a change is made that can be undone
or redone on a SharedTreeView. This allows consumers to listen to the
event in order to manage the sequencing of calls to undo/redo on a
SharedTree vs other DDSes.

## Reviewer Guidance

The review process is outlined on [this wiki
page](https://github.com/microsoft/FluidFramework/wiki/PR-Guidelines#guidelines).

---------

Co-authored-by: Noah Encke <78610362+noencke@users.noreply.github.com>
@CraigMacomber
delete sequence-change-family (#16325)
e5d35a9 
## Description

sequence-change-family is an example change family (compare to the
production modular-change-family) which was used to as part of
bootstrapping and prototyping.

Since its very similar to but not sharing code with sequence fields in
modular change family, maintaining it has some costs.

Additionally, it does not serve as a great change family example since
it implements somewhat complex policies.
A simple last write wins optional field changeset might make a better
example, but for now we can live without any alternative change family
implementations.

Thus, this deletes sequence-change-family.
@tylerbutler
[bump] build-tools: 0.21.0 => 0.22.0 (minor) (#16314)
da87284 
Bumped build-tools from 0.21.0 to 0.22.0.
@tylerbutler
build: Replace deprecated flag in pipeline (#16205)
bbadc8a 
The `exactDepType` flag in flub bump was deprecated and replaced by
interdependencyRange. Update to use it.
@anthony-murphy
Cleanup: Just throw, rather than return Promise.reject (#16326)
9fbaa3b 
Promise.reject should not generally be used, and almost never returned.
This PR replaces `return Promise.reject(...)` with `throw ...` which is
semantically equivalent, but takes less code, and more accurately
matches intent.

---------

Co-authored-by: Tony Murphy <anthonm@microsoft.com>
@msfluid-bot
Automation: main-next integrate
437f1e4
@msfluid-bot msfluid-bot requested review from a team as code owners July 18, 2023 03:28
@github-actions github-actions bot added area: build Build related issues area: dds Issues related to distributed data structures area: dds: propertydds area: dds: tree area: driver Driver related issues area: odsp-driver area: server Server related issues (routerlicious) public api change Changes to a public API base: next PRs targeted against next branch labels Jul 18, 2023
@msfluid-bot
Copy link
Collaborator Author

⯅ @fluid-example/bundle-size-tests: +97 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 432.97 KB 432.97 KB ■ No change
connectionState.js 680 Bytes 680 Bytes ■ No change
containerRuntime.js 232.62 KB 232.62 KB ■ No change
loader.js 144.82 KB 144.82 KB ■ No change
map.js 45.26 KB 45.26 KB ■ No change
matrix.js 138.45 KB 138.45 KB ■ No change
odspDriver.js 88.25 KB 88.25 KB ■ No change
odspPrefetchSnapshot.js 41.49 KB 41.49 KB ■ No change
sharedString.js 154.55 KB 154.55 KB ■ No change
sharedTree2.js 230.93 KB 231.02 KB ⯅ +97 Bytes
Total Size 1.63 MB 1.63 MB ⯅ +97 Bytes

Baseline commit: d00cc1f

Generated by 🚫 dangerJS against 437f1e4

@sonalideshpandemsft sonalideshpandemsft merged commit 437f1e4 into next Jul 18, 2023
41 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-9fbaa3b branch July 18, 2023 03:54
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

@anthony-murphy anthony-murphy

Labels
area: build Build related issues area: dds: propertydds area: dds: tree area: dds Issues related to distributed data structures area: driver Driver related issues area: odsp-driver area: server Server related issues (routerlicious) base: next PRs targeted against next branch 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.
6 participants
@msfluid-bot @sonalideshpandemsft @anthony-murphy @jenn-le @CraigMacomber @tylerbutler