Skip to content

[mergify] Backport to v1.6-branch on request-backport-supported#72757

Open
Alami-Amine wants to merge 1 commit into
project-chip:masterfrom
Alami-Amine:AA/mergify-backport-v1.6
Open

[mergify] Backport to v1.6-branch on request-backport-supported#72757
Alami-Amine wants to merge 1 commit into
project-chip:masterfrom
Alami-Amine:AA/mergify-backport-v1.6

Conversation

@Alami-Amine

Copy link
Copy Markdown
Contributor

Problem

The request-backport-supported label currently triggers backports only to v1.5-branch and v1.4.2-branch. There is no rule to backport to v1.6-branch, even though it is a maintained release branch.

Change overview

  • Add a new Backport to v1.6-branch rule that cherry-picks the squashed master commit to v1.6-branch when a PR carries the request-backport-supported label (same trigger as the existing v1.5 / v1.4.2 rules).
  • Add backport-v1.6-branch to the Auto-merge clean backport PRs rule so the resulting backport PRs auto-merge when CI is green and there are no conflicts, consistent with the other backport targets.

The existing request-backport-sve -> v1.6-sve-branch rule is unchanged.

Testing

  • Validated .mergify.yml parses as well-formed YAML.

Add a backport rule so that PRs labeled request-backport-supported are
also cherry-picked to v1.6-branch (in addition to the existing
v1.5-branch and v1.4.2-branch targets), and allow the resulting
backport-v1.6-branch PRs to auto-merge when CI is green.
@mergify

mergify Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Merge Protections

🟢 Merge protection satisfied — ready to merge.

Show 1 satisfied protection

🟢 📃 Configuration Change Requirements

Mergify configuration change

  • check-success = Configuration changed

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the Mergify configuration in .mergify.yml to add a new backport rule for the v1.6-branch when a pull request is merged into master with the request-backport-supported label. It also updates the automatic labeling conditions to include the backport-v1.6-branch label. There are no review comments, so I have no feedback to provide.

@codecov

codecov Bot commented Jun 26, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 56.60%. Comparing base (51d1d76) to head (b577624).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #72757   +/-   ##
=======================================
  Coverage   56.60%   56.60%           
=======================================
  Files        1642     1642           
  Lines      113136   113136           
  Branches    13245    13245           
=======================================
  Hits        64044    64044           
  Misses      49092    49092           

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions

github-actions Bot commented Jun 26, 2026

Copy link
Copy Markdown

PR #72757: Size comparison from 51d1d76 to b577624

Full report (23 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, psoc6, qpg, realtek, stm32)
platform target config section 51d1d76 b577624d change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1099176 1099176 0 0.0
RAM 133418 133418 0 0.0
bl702 lighting-app bl702+eth FLASH 1085726 1085726 0 0.0
RAM 109029 109029 0 0.0
bl702l contact-sensor-app bl702l+mfd+littlefs FLASH 882218 882218 0 0.0
RAM 108596 108596 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 777368 777368 0 0.0
RAM 103404 103404 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 790120 790120 0 0.0
RAM 108684 108684 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 739376 739376 0 0.0
RAM 97612 97612 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 719548 719548 0 0.0
RAM 97644 97644 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 569654 569654 0 0.0
RAM 205112 205112 0 0.0
lock CC3235SF_LAUNCHXL FLASH 597214 597214 0 0.0
RAM 205272 205272 0 0.0
efr32 lighting-app BRD4187C FLASH 1094924 1094924 0 0.0
RAM 135256 135256 0 0.0
lock-app BRD4187C FLASH 995184 995184 0 0.0
RAM 131292 131292 0 0.0
BRD4338a FLASH 799809 799809 0 0.0
RAM 243432 243432 0 0.0
esp32 all-clusters-app c3devkit DRAM 99556 99556 0 0.0
FLASH 1626146 1626146 0 0.0
IRAM 94776 94776 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 844772 844772 0 0.0
RAM 157771 157771 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1750756 1750756 0 0.0
RAM 215492 215492 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1626548 1626548 0 0.0
RAM 211604 211604 0 0.0
light cy8ckit_062s2_43012 FLASH 1470860 1470860 0 0.0
RAM 197436 197436 0 0.0
lock cy8ckit_062s2_43012 FLASH 1504308 1504308 0 0.0
RAM 225268 225268 0 0.0
qpg lighting-app qpg6200+debug FLASH 843156 843156 0 0.0
RAM 127908 127908 0 0.0
lock-app qpg6200+debug FLASH 782976 782976 0 0.0
RAM 118840 118840 0 0.0
realtek light-switch-app rtl8777g FLASH 689368 689368 0 0.0
RAM 101780 101780 0 0.0
lighting-app rtl8777g FLASH 730304 730304 0 0.0
RAM 102052 102052 0 0.0
stm32 light STM32WB5MM-DK FLASH 478976 478976 0 0.0
RAM 141492 141492 0 0.0

@andy31415 andy31415 added sdk-maintainer-approved PR marked by `matter-sdk-maintainers` as suitable for MERGE - meets guideline & sufficient reviews. backport-v1.6-branch A backport to v1.6 and removed backport-v1.6-branch A backport to v1.6 labels Jun 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

review - pending sdk-maintainer-approved PR marked by `matter-sdk-maintainers` as suitable for MERGE - meets guideline & sufficient reviews.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants