Skip to content

[stable2503] Backport #7947#8259

Merged
acatangiu merged 4 commits intostable2503from
backport-7947-to-stable2503
Apr 18, 2025
Merged

[stable2503] Backport #7947#8259
acatangiu merged 4 commits intostable2503from
backport-7947-to-stable2503

Conversation

@paritytech-release-backport-bot
Copy link
Copy Markdown

Backport #7947 into stable2503 from alistair-singh.

See the documentation on how to use this bot.

@paritytech-release-backport-bot
Copy link
Copy Markdown
Author

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-7947-to-stable2503
git worktree add --checkout .worktree/backport-7947-to-stable2503 backport-7947-to-stable2503
cd .worktree/backport-7947-to-stable2503
git reset --hard HEAD^
git cherry-pick -x 13cb4a31f77a14ea1bec880a7369a59432afaec9
git push --force-with-lease

@github-actions github-actions bot added the A3-backport Pull request is already reviewed well in another branch. label Apr 16, 2025
@acatangiu
Copy link
Copy Markdown
Contributor

@alistair-singh please fix conflicts on the backport

@alistair-singh
Copy link
Copy Markdown
Contributor

alistair-singh commented Apr 17, 2025

@alistair-singh please fix conflicts on the backport

Addressed merge conflicts here:
#8269

alistair-singh and others added 2 commits April 18, 2025 13:18
Merge fixes for backport branch
#8259

Had to cherry-pick the following commits:
#8020
#8038

---------

Co-authored-by: Clara van Staden <claravanstaden64@gmail.com>
Co-authored-by: Ron <yrong1997@gmail.com>
Co-authored-by: Adrian Catangiu <adrian@parity.io>
@acatangiu acatangiu marked this pull request as ready for review April 18, 2025 10:20
@acatangiu acatangiu added the T15-bridges This PR/Issue is related to bridges. label Apr 18, 2025
@paritytech-review-bot paritytech-review-bot bot requested a review from a team April 18, 2025 10:21
@github-actions
Copy link
Copy Markdown
Contributor

This pull request is amending an existing release. Please proceed with extreme caution,
as to not impact downstream teams that rely on the stability of it. Some things to consider:

  • Backports are only for 'patch' or 'minor' changes. No 'major' or other breaking change.
  • Should be a legit fix for some bug, not adding tons of new features.
  • Must either be already audited or not need an audit.
Emergency Bypass

If you really need to bypass this check: add validate: false to each crate
in the Prdoc where a breaking change is introduced. This will release a new major
version of that crate and all its reverse dependencies and basically break the release.

@paritytech-workflow-stopper
Copy link
Copy Markdown

All GitHub workflows were cancelled due to failure one of the required jobs.
Failed workflow url: https://github.com/paritytech/polkadot-sdk/actions/runs/14533776473
Failed job name: test-linux-stable-no-try-runtime

@acatangiu acatangiu enabled auto-merge (squash) April 18, 2025 12:38
@acatangiu acatangiu merged commit 6dc8268 into stable2503 Apr 18, 2025
248 of 263 checks passed
@acatangiu acatangiu deleted the backport-7947-to-stable2503 branch April 18, 2025 20:14
alstjd0921 pushed a commit to bifrost-platform/polkadot-sdk that referenced this pull request Aug 14, 2025
Backport paritytech#7947 into `stable2503` from alistair-singh.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

---------

Co-authored-by: Alistair Singh <alistair.singh7@gmail.com>
Co-authored-by: Clara van Staden <claravanstaden64@gmail.com>
Co-authored-by: Ron <yrong1997@gmail.com>
Co-authored-by: Adrian Catangiu <adrian@parity.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A3-backport Pull request is already reviewed well in another branch. T15-bridges This PR/Issue is related to bridges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants