Skip to content

Commit

Permalink
use stable rust toolchain in ci (paritytech#13830)
Browse files Browse the repository at this point in the history
cargo-fmt stays on the nightly pipeline; our fmt config uses a heap of
unstable features.
  • Loading branch information
Mira Ressel authored Apr 11, 2023
1 parent a1f71b8 commit ca6af5d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 20 deletions.
3 changes: 1 addition & 2 deletions scripts/ci/gitlab/pipeline/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ build-rustdoc:
variables:
SKIP_WASM_BUILD: 1
DOC_INDEX_PAGE: "sc_service/index.html" # default redirected page
RUSTY_CACHIER_TOOLCHAIN: nightly
# this variable gets overriden by "rusty-cachier environment inject", use the value as default
CARGO_TARGET_DIR: "$CI_PROJECT_DIR/target"
artifacts:
Expand All @@ -163,7 +162,7 @@ build-rustdoc:
artifacts: false
script:
- rusty-cachier snapshot create
- time cargo +nightly doc --locked --workspace --all-features --verbose --no-deps
- time cargo doc --locked --workspace --all-features --verbose --no-deps
- rm -f $CARGO_TARGET_DIR/doc/.lock
- mv $CARGO_TARGET_DIR/doc ./crate-docs
# FIXME: remove me after CI image gets nonroot
Expand Down
27 changes: 9 additions & 18 deletions scripts/ci/gitlab/pipeline/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,17 @@ cargo-clippy:
needs:
- job: cargo-fmt
artifacts: false
variables:
RUSTY_CACHIER_TOOLCHAIN: nightly
extends:
- .docker-env
- .test-refs
script:
- rusty-cachier snapshot create
- SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets
- SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo clippy --all-targets
- rusty-cachier cache upload

cargo-check-benches:
stage: test
variables:
# Override to use nightly toolchain
RUSTY_CACHIER_TOOLCHAIN: "nightly"
CI_JOB_NAME: "cargo-check-benches"
extends:
- .docker-env
Expand Down Expand Up @@ -105,7 +101,7 @@ cargo-check-benches:
- echo "___Running benchmarks___";
- case ${CI_NODE_INDEX} in
1)
SKIP_WASM_BUILD=1 time cargo +nightly check --locked --benches --all;
SKIP_WASM_BUILD=1 time cargo check --locked --benches --all;
cargo run --locked --release -p node-bench -- ::trie::read::small --json
| tee ./artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA/::trie::read::small.json;
echo "___Uploading cache for rusty-cachier___";
Expand Down Expand Up @@ -301,17 +297,16 @@ test-frame-examples-compile-to-wasm:
- .docker-env
- .test-refs
variables:
RUSTY_CACHIER_TOOLCHAIN: nightly
# Enable debug assertions since we are running optimized builds for testing
# but still want to have debug assertions.
RUSTFLAGS: "-C debug-assertions"
RUST_BACKTRACE: 1
script:
- rusty-cachier snapshot create
- cd ./frame/examples/offchain-worker/
- cargo +nightly build --locked --target=wasm32-unknown-unknown --no-default-features
- cargo build --locked --target=wasm32-unknown-unknown --no-default-features
- cd ../basic
- cargo +nightly build --locked --target=wasm32-unknown-unknown --no-default-features
- cargo build --locked --target=wasm32-unknown-unknown --no-default-features
- rusty-cachier cache upload

test-linux-stable-int:
Expand Down Expand Up @@ -344,17 +339,15 @@ check-tracing:
needs:
- job: test-linux-stable-int
artifacts: false
variables:
RUSTY_CACHIER_TOOLCHAIN: nightly
extends:
- .docker-env
- .test-refs
- .pipeline-stopper-artifacts
script:
- rusty-cachier snapshot create
# with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases
- time cargo +nightly test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features
- time cargo +nightly test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features --features=with-tracing
- time cargo test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features
- time cargo test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features --features=with-tracing
- rusty-cachier cache upload

# more information about this job can be found here:
Expand All @@ -369,17 +362,16 @@ test-full-crypto-feature:
- .docker-env
- .test-refs
variables:
RUSTY_CACHIER_TOOLCHAIN: nightly
# Enable debug assertions since we are running optimized builds for testing
# but still want to have debug assertions.
RUSTFLAGS: "-C debug-assertions"
RUST_BACKTRACE: 1
script:
- rusty-cachier snapshot create
- cd primitives/core/
- time cargo +nightly build --locked --verbose --no-default-features --features full_crypto
- time cargo build --locked --verbose --no-default-features --features full_crypto
- cd ../application-crypto
- time cargo +nightly build --locked --verbose --no-default-features --features full_crypto
- time cargo build --locked --verbose --no-default-features --features full_crypto
- rusty-cachier cache upload

check-rustdoc:
Expand All @@ -388,12 +380,11 @@ check-rustdoc:
- .docker-env
- .test-refs
variables:
RUSTY_CACHIER_TOOLCHAIN: nightly
SKIP_WASM_BUILD: 1
RUSTDOCFLAGS: "-Dwarnings"
script:
- rusty-cachier snapshot create
- time cargo +nightly doc --locked --workspace --all-features --verbose --no-deps
- time cargo doc --locked --workspace --all-features --verbose --no-deps
- rusty-cachier cache upload

cargo-check-each-crate:
Expand Down

0 comments on commit ca6af5d

Please sign in to comment.