Skip to content

Handle Rust >= 1.91 change of target-pointer-width JSON type #341

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle Rust >= 1.91 change of target-pointer-width JSON type #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ version = "0.29.0"
authors = ["Jan Bujak <jan@parity.io>", "Parity Technologies <admin@parity.io>"]
license = "MIT/Apache-2.0"
edition = "2021"
rust-version = "1.86.0"
rust-version = "1.91.0"
repository = "https://github.com/koute/polkavm"

[workspace.dependencies]
Expand Down
6 changes: 3 additions & 3 deletions ci/jobs/build-and-test-pallet-revive.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euo pipefail
cd -- "$(dirname -- "${BASH_SOURCE[0]}")"

rustup toolchain install --component=rust-src 1.88.0
rustup toolchain install --component=rust-src 1.91.0

POLKAVM_CRATES_ROOT="$(pwd)/proxy-crates"

Expand All @@ -21,9 +21,9 @@ git fetch --depth=1 origin $COMMIT
git checkout $COMMIT

echo '[toolchain]' > rust-toolchain.toml
echo 'channel = "1.88.0"' >> rust-toolchain.toml
echo 'channel = "1.91.0"' >> rust-toolchain.toml

PALLET_REVIVE_FIXTURES_RUSTUP_TOOLCHAIN=1.88.0 \
PALLET_REVIVE_FIXTURES_RUSTUP_TOOLCHAIN=1.91.0 \
PALLET_REVIVE_FIXTURES_STRIP=0 \
PALLET_REVIVE_FIXTURES_OPTIMIZE=1 \
cargo test \
Expand Down
2 changes: 1 addition & 1 deletion crates/polkavm-linker/riscv32emac-unknown-none-polkavm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"max-atomic-width": 64,
"panic-strategy": "abort",
"relocation-model": "pie",
"target-pointer-width": "32",
"target-pointer-width": 32,
"singlethread": true,
"pre-link-args": {
"ld": [
Expand Down
2 changes: 1 addition & 1 deletion crates/polkavm-linker/riscv64emac-unknown-none-polkavm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"max-atomic-width": 64,
"panic-strategy": "abort",
"relocation-model": "pie",
"target-pointer-width": "64",
"target-pointer-width": 64,
"singlethread": true,
"pre-link-args": {
"ld": [
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.86.0"
channel = "1.91.0"
2 changes: 1 addition & 1 deletion tools/benchtool/rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.86.0"
channel = "1.91.0"
2 changes: 1 addition & 1 deletion tools/gastool/rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.86.0"
channel = "1.91.0"