Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Use stable toolchain as default for ink! related CI images #453

Merged
merged 8 commits into from
Aug 26, 2022
Merged

Use stable toolchain as default for ink! related CI images #453

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4e53ab4
Use stable toolchain as default for ink! related CI images
HCastano Aug 24, 2022
c629e22
Merge branch 'master' into hc-default-to-stable
HCastano Aug 24, 2022
05b8e8c
Add `wasm32-unknown-unknown` target to `stable` toolchain
HCastano Aug 25, 2022
20135da
Make dependency installation more legible
HCastano Aug 26, 2022
1e2ae14
Add `rustup` back when intalling `wasm32` target
HCastano Aug 26, 2022
6669bd2
More legibility improvements
HCastano Aug 26, 2022
fb44295
Ident comments
HCastano Aug 26, 2022
a5be4d4
Change spaces to tabs
HCastano Aug 26, 2022
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
4 changes: 3 additions & 1 deletion dockerfiles/contracts-ci-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@ RUN set -eux; \
rm -rf binaryen-*/ && \
# Installs the latest common nightly for the listed components,
# adds those components, wasm target and sets the profile to minimal
target add wasm32-unknown-unknown --toolchain stable && \
rustup component add rust-src --toolchain stable && \
rustup toolchain install nightly-2022-07-28 --target wasm32-unknown-unknown \
--profile minimal --component rustfmt clippy rust-src && \
# Alias pinned toolchain as nightly, otherwise it appears as though we
# don't have a nightly toolchain (i.e rustc +nightly --version is empty)
ln -s /usr/local/rustup/toolchains/nightly-2022-07-28-x86_64-unknown-linux-gnu \
/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu && \
rustup default nightly && \
rustup default stable && \
athei marked this conversation as resolved.
Show resolved Hide resolved
cargo install cargo-dylint dylint-link && \
cargo install cargo-contract && \
# download the latest `substrate-contracts-node` binary
Expand Down
6 changes: 4 additions & 2 deletions dockerfiles/ink-ci-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,15 @@ RUN set -eux; \
# and targets can be used for this docker image.
# Installs the latest common nightly for the listed components,
# adds those components, wasm target and sets the profile to minimal
target add wasm32-unknown-unknown --toolchain stable && \
rustup component add rust-src --toolchain stable && \
rustup toolchain install nightly-2022-07-28 --target wasm32-unknown-unknown \
--profile minimal --component rustfmt clippy miri rust-src rustc-dev llvm-tools-preview && \
# Alias pinned toolchain as nightly, otherwise it appears as though we
# don't have a nightly toolchain (i.e rustc +nightly --version is empty)
ln -s /usr/local/rustup/toolchains/nightly-2022-07-28-x86_64-unknown-linux-gnu \
/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu && \
rustup default nightly && \
/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu && \
athei marked this conversation as resolved.
Show resolved Hide resolved
rustup default stable && \
# We require `xargo` so that `miri` runs properly
# We require `grcov` for coverage reporting and `rust-covfix` to improve it.
# We require `cargo-spellcheck` for automated spell-checking
Expand Down