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

👷 use devflow to merge main into staging #2927

Merged
merged 4 commits into from
Aug 13, 2024
Merged

Conversation

thomas-lebeau
Copy link
Collaborator

@thomas-lebeau thomas-lebeau commented Aug 7, 2024

Motivation

Use devflow to merge main back into staging-XX.
If this fails, it will create a fix PR and log something like this:

couldn't merge the [main](https://github.com/DataDog/browser-sdk/tree/main) branch of [browser-sdk](https://github.com/DataDog/browser-sdk) into [thomas.lebeau/test-devflow-conflic](https://github.com/DataDog/browser-sdk/tree/thomas.lebeau/test-devflow-conflic), there was a conflict...

We have created a conflict resolution PR for you [#2916](https://github.com/DataDog/browser-sdk/pull/2916)
Alternatively, you can also reset the integration branch by using the following slack command: `/devflow reset-branch -r browser-sdk -b thomas.lebeau/test-devflow-conflic`

To get help about command usage, write `update-branch --help`

Changes

Testing

  • Local
  • Staging
  • Unit
  • End to end

I have gone over the contributing documentation.

@thomas-lebeau thomas-lebeau changed the title Thomas.lebeau/devflow @thomas-lebeau 👷 use devflow to merge main into staging Aug 7, 2024
@thomas-lebeau thomas-lebeau changed the title @thomas-lebeau 👷 use devflow to merge main into staging 👷 use devflow to merge main into staging Aug 7, 2024
@thomas-lebeau thomas-lebeau force-pushed the thomas.lebeau/devflow branch from 5dc924f to 20aeef7 Compare August 7, 2024 15:55
@thomas-lebeau thomas-lebeau force-pushed the thomas.lebeau/devflow branch from 20aeef7 to bb3a0d8 Compare August 7, 2024 15:56
@codecov-commenter
Copy link

codecov-commenter commented Aug 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.63%. Comparing base (e6f87a8) to head (9d296f8).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2927   +/-   ##
=======================================
  Coverage   93.63%   93.63%           
=======================================
  Files         269      269           
  Lines        7587     7587           
  Branches     1692     1692           
=======================================
  Hits         7104     7104           
  Misses        483      483           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

cit-pr-commenter bot commented Aug 8, 2024

Bundles Sizes Evolution

📦 Bundle Name Base Size Local Size 𝚫 𝚫% Status
Rum 158.91 KiB 158.91 KiB 0 B 0.00%
Logs 55.93 KiB 55.93 KiB 0 B 0.00%
Rum Slim 107.52 KiB 107.52 KiB 0 B 0.00%
Worker 25.21 KiB 25.21 KiB 0 B 0.00%
🚀 CPU Performance
Action Name Base Average Cpu Time (ms) Local Average Cpu Time (ms) 𝚫
addglobalcontext 0.002 0.002 0.000
addaction 0.038 0.036 -0.001
addtiming 0.001 0.001 -0.000
adderror 0.039 0.036 -0.003
startstopsessionreplayrecording 0.997 1.114 0.117
startview 1.053 0.958 -0.095
logmessage 0.027 0.026 -0.002
🧠 Memory Performance
Action Name Base Consumption Memory (bytes) Local Consumption Memory (bytes) 𝚫 (bytes)
addglobalcontext 18.00 KiB 20.34 KiB 2.34 KiB
addaction 67.32 KiB 70.15 KiB 2.83 KiB
addtiming 15.24 KiB 16.22 KiB 1010 B
adderror 83.49 KiB 86.40 KiB 2.92 KiB
startstopsessionreplayrecording 11.52 KiB 12.37 KiB 862 B
startview 347.44 KiB 351.11 KiB 3.67 KiB
logmessage 66.78 KiB 67.63 KiB 873 B

🔗 RealWorld

@thomas-lebeau thomas-lebeau marked this pull request as ready for review August 9, 2024 15:57
@thomas-lebeau thomas-lebeau requested a review from a team as a code owner August 9, 2024 15:57
@thomas-lebeau thomas-lebeau merged commit 670d5ce into main Aug 13, 2024
20 checks passed
@thomas-lebeau thomas-lebeau deleted the thomas.lebeau/devflow branch August 13, 2024 06:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants