👷 add job to merge main into next major feature branch (v6)

[thomas-lebeau]

Motivation

The next major feature branch (v6) will be a long living branch, we need to make sure we're merging main into it regularly to avoid larger conflicts resolution later.

This job will merge main into v6 and trigger the CI.
If merging fails, devflow will create a fix PR (link in the logs). We will need to follow the created PR's instruction (i.e. fixing the conflict ant resuming the job) and then re-run the job to continue the pipeline

Changes

• Add a CI job to automatically merge the main branch into the next major feature branch (currently v6)
• refactor update-branch to trigger the CI after updating the branch

Testing

• Local
• Staging
• Unit
• End to end

---

I have gone over the contributing documentation.

[cit-pr-commenter]

Bundles Sizes Evolution

📦 Bundle Name	Base Size	Local Size	𝚫	𝚫%	Status
Rum	160.16 KiB	160.16 KiB	0 B	0.00%	✅
Logs	55.98 KiB	55.98 KiB	0 B	0.00%	✅
Rum Slim	108.76 KiB	108.76 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.034	0.032	-0.003
addtiming	0.001	0.001	0.000
adderror	0.034	0.032	-0.001
startstopsessionreplayrecording	0.941	0.836	-0.106
startview	1.001	0.961	-0.040
logmessage	0.026	0.019	-0.007

🧠 Memory Performance

Action Name	Base Consumption Memory (bytes)	Local Consumption Memory (bytes)	𝚫 (bytes)
addglobalcontext	17.80 KiB	18.43 KiB	641 B
addaction	69.91 KiB	68.24 KiB	-1716 B
addtiming	15.06 KiB	15.97 KiB	930 B
adderror	83.46 KiB	85.43 KiB	1.96 KiB
startstopsessionreplayrecording	13.27 KiB	13.14 KiB	-133 B
startview	346.04 KiB	348.26 KiB	2.22 KiB
logmessage	64.91 KiB	67.79 KiB	2.88 KiB

🔗 RealWorld

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.48%. Comparing base (670d5ce) to head (067ce91).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2935      +/-   ##
==========================================
+ Coverage   93.47%   93.48%   +0.01%     
==========================================
  Files         271      271              
  Lines        7616     7616              
  Branches     1696     1696              
==========================================
+ Hits         7119     7120       +1     
+ Misses        497      496       -1     

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

[BenoitZugmeyer]

👏 praise: ‏TIL! This is great :)