From fa08a1e35cde4e1b254529f31060d2cd825ac56d Mon Sep 17 00:00:00 2001
From: TriplEight <denis.pisarev@parity.io>
Date: Fri, 24 May 2019 12:24:37 +0200
Subject: [PATCH] rust versions (#2681)

---
 substrate/.gitlab-ci.yml | 59 ++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/substrate/.gitlab-ci.yml b/substrate/.gitlab-ci.yml
index abab05f74e..0ee23e7253 100644
--- a/substrate/.gitlab-ci.yml
+++ b/substrate/.gitlab-ci.yml
@@ -38,6 +38,12 @@ variables:
   environment:
     name: parity-build
 
+.compiler_info:                         &compiler_info
+  before_script:
+    - rustup show
+    - cargo --version
+    - sccache -s
+
 
 #### stage:                        test
 
@@ -67,6 +73,7 @@ check-line-width:
 
 test-linux-stable:                 &test
   stage:                           test
+  <<:                              *compiler_info
   variables:
     RUST_TOOLCHAIN: stable
     # Enable debug assertions since we are running optimized builds for testing
@@ -84,15 +91,14 @@ test-linux-stable:                 &test
   except:
     variables:
       - $DEPLOY_TAG
-  before_script:
-    - sccache -s
-    - ./scripts/build.sh
   script:
+    - ./scripts/build.sh
     - time cargo test --all --release --verbose --locked
     - sccache -s
 
 check-web-wasm:
   stage:                           test
+  <<:                              *compiler_info
   allow_failure:                   true
   only:
     - master
@@ -115,6 +121,7 @@ check-web-wasm:
     - time cargo web build -p substrate-state-db
     - time cargo web build -p substrate-state-machine
     - time cargo web build -p substrate-trie
+    - sccache -s
   tags:
     - linux-docker
 
@@ -126,19 +133,18 @@ check-web-wasm:
 
 #### stage:                        build
 
-build-linux-release:               &build
+build-linux-release:
   stage:                           build
   <<:                              *collect-artifacts
   <<:                              *build-only
+  <<:                              *compiler_info
   except:
     variables:
       - $DEPLOY_TAG
   tags:
     - linux-docker
-  before_script:
-    - sccache -s
-    - ./scripts/build.sh
   script:
+    - ./scripts/build.sh
     - time cargo build --release --verbose
     - mkdir -p ./artifacts
     - mv ./target/release/substrate ./artifacts/.
@@ -156,8 +162,9 @@ build-linux-release:               &build
     - cp -r scripts/docker/* ./artifacts
     - sccache -s
 
-build-rust-doc-release:            &build
+build-rust-doc-release:
   stage:                           build
+  <<:                              *compiler_info
   allow_failure:                   true
   artifacts:
     name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
@@ -168,10 +175,8 @@ build-rust-doc-release:            &build
   <<:                              *build-only
   tags:
     - linux-docker
-  before_script:
-    - sccache -s
-    - ./scripts/build.sh
   script:
+    - ./scripts/build.sh
     - rm -f ./crate-docs/index.html # use it as an indicator if the job succeeds
     - time cargo +nightly doc --release --verbose
     - cp -R ./target/doc ./crate-docs
@@ -317,46 +322,46 @@ publish-s3-doc:
 deploy-ew3:
   <<:                              *deploy-cibuild
   environment:
-    name: parity-prod-ew3
+    name:                          parity-prod-ew3
 
 deploy-ue1:
   <<:                              *deploy-cibuild
   environment:
-    name: parity-prod-ue1
+    name:                          parity-prod-ue1
 
 deploy-ew3-tag:
   <<:                              *deploy-tag
   environment:
-    name: parity-prod-ew3
+    name:                          parity-prod-ew3
 
 deploy-ue1-tag:
   <<:                              *deploy-tag
   environment:
     name: parity-prod-ue1
 
-.validator-deploy: &validator-deploy
-  stage: flaming-fir
+.validator-deploy:                 &validator-deploy
+  stage:                           flaming-fir
   dependencies:
     - build-linux-release
-  image: parity/azure-ansible:v1
-  allow_failure: true
-  when: manual
+  image:                           parity/azure-ansible:v1
+  allow_failure:                   true
+  when:                            manual
   tags:
     - linux-docker
 
-validator1:
-  <<: *validator-deploy
+validator 1 4:
+  <<:                              *validator-deploy
   script:
     - ./scripts/flamingfir-deploy.sh flamingfir-validator1
-validator2:
-  <<: *validator-deploy
+validator 2 4:
+  <<:                              *validator-deploy
   script:
     - ./scripts/flamingfir-deploy.sh flamingfir-validator2
-validator3:
-  <<: *validator-deploy
+validator 3 4:
+  <<:                              *validator-deploy
   script:
     - ./scripts/flamingfir-deploy.sh flamingfir-validator3
-validator4:
-  <<: *validator-deploy
+validator 4 4:
+  <<:                              *validator-deploy
   script:
     - ./scripts/flamingfir-deploy.sh flamingfir-validator4