Skip to content
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

chore: Update toolchain for ink_linting #1616

Merged
merged 3 commits into from
Apr 25, 2024
Merged

chore: Update toolchain for ink_linting #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c90be90
chore: Update toolchain for `ink_linting`
jubnzv Apr 24, 2024
fc6b5b7
chore: Update `ink_linting` version
jubnzv Apr 24, 2024
1bd9633
chore: Update toolchain
jubnzv Apr 24, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions crates/build/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading