diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8a03764e1fcb..6a0525fe71d60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,27 +156,6 @@ test-srml-staking: &test-srml-staking - time cargo test --release --verbose --no-default-features --features std - sccache -s -test-full-crypto-feature: &test-full-crypto-feature - stage: test - <<: *docker-env - variables: - # Enable debug assertions since we are running optimized builds for testing - # but still want to have debug assertions. - RUSTFLAGS: -Cdebug-assertions=y - RUST_BACKTRACE: 1 - except: - variables: - - $DEPLOY_TAG - script: - - cd core/primitives/ - - time cargo build --verbose --no-default-features --features full_crypto - - cd ../application-crypto - - time cargo build --verbose --no-default-features --features full_crypto - - sccache -s - - - - test-linux-stable-int: <<: *test-linux @@ -292,6 +271,25 @@ build-linux-subkey: - cp -r scripts/docker/subkey.Dockerfile ./artifacts/subkey/ - sccache -s +build-full-crypto-feature: + stage: build + <<: *collect-artifacts + <<: *docker-env + <<: *build-only + variables: + # Enable debug assertions since we are running optimized builds for testing + # but still want to have debug assertions. + RUST_BACKTRACE: 1 + except: + variables: + - $DEPLOY_TAG + script: + - cd core/primitives/ + - time cargo build --verbose --no-default-features --features full_crypto + - cd ../application-crypto + - time cargo build --verbose --no-default-features --features full_crypto + - sccache -s + build-rust-doc-release: stage: build <<: *docker-env diff --git a/core/application-crypto/src/ed25519.rs b/core/application-crypto/src/ed25519.rs index a6528b49f6791..99100e40834d6 100644 --- a/core/application-crypto/src/ed25519.rs +++ b/core/application-crypto/src/ed25519.rs @@ -21,7 +21,7 @@ use crate::{RuntimePublic, KeyTypeId}; pub use primitives::ed25519::*; mod app { - use crate::Vec; + use rstd::vec::Vec; use primitives::testing::ED25519; crate::app_crypto!(super, ED25519); diff --git a/core/application-crypto/src/sr25519.rs b/core/application-crypto/src/sr25519.rs index 8103011a3827e..ab5a4e3d0d257 100644 --- a/core/application-crypto/src/sr25519.rs +++ b/core/application-crypto/src/sr25519.rs @@ -21,7 +21,7 @@ use crate::{RuntimePublic, KeyTypeId}; pub use primitives::sr25519::*; mod app { - use crate::Vec; + use rstd::vec::Vec; use primitives::testing::SR25519; crate::app_crypto!(super, SR25519);