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

Merged
merged 3 commits into from
Dec 12, 2023
Merged

Automation: main-next integrate #18768

merged 3 commits into from
Dec 12, 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-87967b7 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-87967b7 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.

The returned audience payload contains the user's name, email, id and
oid. Both the id and email fields share the same response, representing
the user's email id. This PR introduces the addition of oid to the
OdspUser interface. The OdpMember's userId is equal to OdspUser's oid.


[AB#6278](https://dev.azure.com/fluidframework/internal/_workitems/edit/6276)
@sonalideshpandemsft
Copy link
Contributor

ack

@msfluid-bot
Copy link
Collaborator Author

@fluid-example/bundle-size-tests: +14 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 452.78 KB 452.78 KB +2 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 239.23 KB 239.23 KB No change
loader.js 166.81 KB 166.82 KB +2 Bytes
map.js 46.7 KB 46.7 KB +2 Bytes
matrix.js 147.36 KB 147.36 KB +2 Bytes
odspDriver.js 90.35 KB 90.36 KB +2 Bytes
odspPrefetchSnapshot.js 41.82 KB 41.82 KB +2 Bytes
sharedString.js 165.55 KB 165.55 KB No change
sharedTree2.js 287.36 KB 287.36 KB No change
Total Size 1.75 MB 1.75 MB +14 Bytes

Baseline commit: a528075

Generated by 🚫 dangerJS against 425e143

@sonalideshpandemsft sonalideshpandemsft merged commit 425e143 into next Dec 12, 2023
27 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-87967b7 branch December 12, 2023 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants