Skip to content

Commit c3106ac

Browse files
paritytech-release-backport-bot[bot]0xRVEEgorPopelyaevatheigithub-actions[bot]
authored
[stable2506] Backport #10749 (#11586)
Backport #10749 into `stable2506` from 0xRVE. 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: 0xRVE <robertvaneerdewijk@gmail.com> Co-authored-by: Egor_P <egor@parity.io> Co-authored-by: Alexander Theißen <alex.theissen@me.com> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent bd4ed62 commit c3106ac

9 files changed

Lines changed: 6065 additions & 10 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Plan.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated by parity-publish v0.10.15
1+
# generated by parity-publish v0.10.14
22
# command: parity-publish plan --prdoc prdoc
33

44
[options]
@@ -486,9 +486,9 @@ reason = "changed"
486486
[[crate]]
487487
# substrate/frame/revive/fixtures
488488
name = "pallet-revive-fixtures"
489-
from = "0.3.2"
490-
to = "0.4.0"
491-
bump = "major"
489+
from = "0.4.0"
490+
to = "0.4.1"
491+
bump = "patch"
492492
reason = "changed"
493493

494494
[[crate]]
@@ -1986,8 +1986,8 @@ reason = "changed"
19861986
[[crate]]
19871987
# substrate/frame/revive
19881988
name = "pallet-revive"
1989-
from = "0.7.0"
1990-
to = "0.7.1"
1989+
from = "0.7.1"
1990+
to = "0.7.2"
19911991
bump = "patch"
19921992
reason = "changed"
19931993

prdoc/stable2506-10/pr_10749.prdoc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
title: '[pallet-revive] fixtures compilation fix for rust 1.92.0'
2+
doc:
3+
- audience: Runtime Dev
4+
description: |-
5+
Fix this error after upgrading to rustc 1.92.0:
6+
7+
```
8+
error: panic_immediate_abort is now a real panic strategy! Enable it with `panic = "immediate-abort"` in Cargo.toml, or with the compiler flags `-Zunstable-options -Cpanic=immediate-abort`. In both cases, you still need to build core, e.g. with `-Zbuild-std`
9+
--> /Users/robert/.rustup/toolchains/1.92.0-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/panicking.rs:36:1
10+
```
11+
crates:
12+
- name: pallet-revive-fixtures
13+
bump: patch
14+
- name: pallet-revive
15+
bump: patch

prdoc/stable2506-10/pr_10780.prdoc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
title: Fix pallet-revive-fixtures
2+
doc:
3+
- audience: Runtime Dev
4+
description: |-
5+
Fixing two issues:
6+
7+
1. Build on rustc >= 1.92 was broken despite https://github.com/paritytech/polkadot-sdk/pull/10749. That PR was broken.
8+
2. The nested cargo didn't properly inherit the parent toolchain (an older error). Leading to the situation where a `1.88` was only applied to the parent toolchain
9+
10+
Replacement for https://github.com/paritytech/polkadot-sdk/pull/10778.
11+
crates:
12+
- name: pallet-revive-fixtures
13+
bump: patch

scripts/release/templates/crates_list.md.tera

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ The following crates were updated to the corresponding versions:
77
- pallet-conviction-voting@41.0.1
88
- polkadot-collator-protocol@24.0.2
99
- cumulus-client-consensus-aura@0.24.1
10+
- pallet-revive-fixtures@0.4.1
11+
- pallet-revive@0.7.2
1012

1113
</details>

substrate/frame/revive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pallet-revive"
3-
version = "0.7.1"
3+
version = "0.7.2"
44
authors.workspace = true
55
edition.workspace = true
66
license = "Apache-2.0"

substrate/frame/revive/fixtures/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pallet-revive-fixtures"
3-
version = "0.4.0"
3+
version = "0.4.1"
44
authors.workspace = true
55
edition.workspace = true
66
license.workspace = true

0 commit comments

Comments
 (0)