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

Merged
merged 13 commits into from
Dec 13, 2023
Merged

Automation: main-next integrate #18798

merged 13 commits into from
Dec 13, 2023

Conversation

msfluid-bot
Copy link
Collaborator

main-next integrate PR

DO NOT MERGE THIS PR USING THE GITHUB UI.

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-da913cd 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-da913cd 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

Once CI passes and the PR is ready to merge, add the "msftbot: merge-next" label to the PR and one of the people with merge permissions will merge it in.

CraigMacomber and others added 12 commits December 11, 2023 15:53
## Description

Add example of unions like enums.

Future work could polish up this utility and we could export it. For now
this shows how it could be done.
#18756)

Updates the existing documentation (which was previously an interior
directory overview doc) to be a package README.
- Updates existing formatting to better match our standard patterns
- Adds basic Fluid Framework package instructions using our
`markdown-magic` pragmas
Fixes a bug in #18559 where SweepReady nodes would not be Tombstoned
when Sweep was disabled.
…uments (#18725)

Fixes AB#6481.

In light of #18559, Tombstone and Sweep should always be enabled in
lockstep in terms of which documents are eligible. Today this is
determined by two independent options `gcTombstoneGeneration` and
`gcSweepGeneration`. We are consolidating on a single `gcGeneration`
(with a back-compat measure for old docs with only
`gcTombstoneGeneration`).

The semantics follow the same concept: Any document stamped with the
matching generation value that's current passed will be eligible for
both the Tombstone and Delete stages of Sweep Phase. Importantly, if no
value is passed in, Sweep is considered enabled for that document.

Then in order to configure whether to run the Delete stage in a given
session, there's a new GC option called `enableGCSweep` which can be set
to `true` (default is don't delete, only Tombstone).

### Additional behavior change:

* Small bug fix: Tombstone Enforcement was always false in the first
session for a container if a tombstoneGeneration option was passed
As part of preparation for next 7.4.0 minor release.

---------

Co-authored-by: Tyler Butler <tyler@tylerbutler.com>
Updates the protocol-definitions build to produce both CJS and ESM with
correct types. Also adds are-the-types-wrong to verify the types.
## Description

Adds a suite of unit tests to the Gitrest GitWholeSummaryManager.

## Reviewer Guidance

- I generated the `examples.ts` data from an open source app that I
authored myself. The content is Lorem Ipsum based, so there is no
"customer content" here.
This PR marks the odsp-client e2e test package as non-private
Projects no longer need to explicitly define a declarationDir in their
tsconfig, and those that did were causing ESM type output to be placed
alongside CJS source in ./dist. This PR removes the declarationDir
setting from all tsconfigs.
Remaining asserts tagging  for 7.4 minor release
@msfluid-bot msfluid-bot requested review from a team as code owners December 13, 2023 01:10
@tylerbutler tylerbutler assigned tylerbutler and unassigned znewton Dec 13, 2023
@msfluid-bot
Copy link
Collaborator Author

@fluid-example/bundle-size-tests: +404.88 KB
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 487.96 KB 598.52 KB +110.56 KB
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 274.75 KB 293.66 KB +18.9 KB
loader.js 166.81 KB 188.15 KB +21.34 KB
map.js 79.76 KB 99.29 KB +19.54 KB
matrix.js 180.36 KB 242.82 KB +62.46 KB
odspDriver.js 90.35 KB 112.01 KB +21.65 KB
odspPrefetchSnapshot.js 41.82 KB 67.4 KB +25.58 KB
sharedString.js 198.37 KB 307.67 KB +109.3 KB
sharedTree2.js 301.06 KB 323.16 KB +22.09 KB
Total Size 1.9 MB 2.29 MB +404.88 KB

Baseline commit: ef49d00

Generated by 🚫 dangerJS against 9a451d4

@tylerbutler tylerbutler merged commit 9a451d4 into next Dec 13, 2023
31 checks passed
@tylerbutler tylerbutler deleted the main-next-da913cd branch December 13, 2023 01:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
base: next PRs targeted against next branch main-next-integrate merge-ok
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants