From a5dc570928e28b63bf3600544f29b8b4f681d3b8 Mon Sep 17 00:00:00 2001 From: Georgiy Komarov Date: Thu, 25 Apr 2024 02:52:14 -0400 Subject: [PATCH] chore: Update toolchain for `ink_linting` (#1616) * chore: Update toolchain for `ink_linting` See: https://github.com/paritytech/ink/pull/2112 * chore: Update `ink_linting` version * chore: Update toolchain --- CHANGELOG.md | 3 +++ README.md | 2 +- build-image/Dockerfile | 4 ++-- crates/build/src/lib.rs | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e55cb0374..5a93ef18c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Updated the toolchain version used by `ink_linting` - [#1616](https://github.com/paritytech/cargo-contract/pull/1616) + ## [4.1.1] ### Fixed diff --git a/README.md b/README.md index b16ee3ec1..498dd9cae 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Modern releases of gcc and clang, as well as Visual Studio 2019+ should work. - (MacOS) `brew install openssl` - ``` - export TOOLCHAIN_VERSION=nightly-2023-12-28 + export TOOLCHAIN_VERSION=nightly-2024-02-08 rustup install $TOOLCHAIN_VERSION rustup component add rust-src --toolchain $TOOLCHAIN_VERSION rustup run $TOOLCHAIN_VERSION cargo install cargo-dylint dylint-link diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 13239e41f..e9f5df876 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -20,7 +20,7 @@ ARG WGET_VERSION=1.21-1+deb11u1 ARG G_VERSION=4:10.2.1-1 ARG MUSL_V=1.2.2-1 # The rust version used by linter -ARG RUST_LINTER_VERSION=nightly-2023-12-28 +ARG RUST_LINTER_VERSION=nightly-2024-02-08 # metadata LABEL io.parity.image.vendor="Parity Technologies" \ @@ -105,7 +105,7 @@ RUN apt-get -y update && apt-get -y install gcc=${GCC_VERSION} g++=${G_VERSION} && cargo install cargo-dylint dylint-link \ # Check if build with linting works && cargo contract new test \ - # Generate /usr/local/dylint_drivers/nightly-2023-12-28-x86_64-unknown-linux-gnu/dylint-driver bin + # Generate /usr/local/dylint_drivers/nightly-2024-02-08-x86_64-unknown-linux-gnu/dylint-driver bin && mkdir -p $DYLINT_DRIVER_PATH \ && cd test && cargo contract build --lint --verbose --release && cd .. \ && rm -rf test \ diff --git a/crates/build/src/lib.rs b/crates/build/src/lib.rs index 87271a72e..8e134aa91 100644 --- a/crates/build/src/lib.rs +++ b/crates/build/src/lib.rs @@ -114,11 +114,11 @@ const VERSION: &str = env!("CARGO_PKG_VERSION"); pub(crate) mod linting { /// Toolchain used to build ink_linting: /// https://github.com/paritytech/ink/blob/master/linting/rust-toolchain.toml - pub const TOOLCHAIN_VERSION: &str = "nightly-2023-12-28"; + pub const TOOLCHAIN_VERSION: &str = "nightly-2024-02-08"; /// Git repository with ink_linting libraries pub const GIT_URL: &str = "https://github.com/paritytech/ink/"; /// Git revision number of the linting crate - pub const GIT_REV: &str = "b6880dd9384e09ec4e7ad65453cd844113e8a316"; + pub const GIT_REV: &str = "ef91c60e52eb5d3ae80fd25082bc0a9468332e36"; } /// Arguments to use when executing `build` or `check` commands.