@bkchr requested changes. moved full_crypto CI test to build stage

paritytech · Oct 30, 2019 · 536d6c3 · 536d6c3
1 parent c6ee791
commit 536d6c3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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);