From 869b3b74f55e3abf3449b5ffa22d0cb794633ec0 Mon Sep 17 00:00:00 2001
From: Denis P <denis.pisarev@parity.io>
Date: Tue, 29 Sep 2020 19:33:03 +0200
Subject: [PATCH 1/2] change (CI): CARGO_HOME, RUST_INCREMENTAL, no artifacts
 for needs, only -> rules

---
 .gitlab-ci.yml | 55 +++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 633c622b02..9d8ef8e672 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,9 +14,9 @@ stages:
 variables:
   GIT_STRATEGY:                    fetch
   GIT_DEPTH:                       100
+  CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
+  CARGO_INCREMENTAL:               0
   CARGO_TARGET_DIR:                "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}"
-  CI_SERVER_NAME:                  "GitLab CI"
-  REGISTRY:                        "paritytech"
   ALL_CRATES:                      "core core/derive alloc prelude primitives lang lang/macro lang/ir"
 
 .collect-artifacts:                &collect-artifacts
@@ -28,7 +28,7 @@ variables:
       - artifacts/
 
 .docker-env:                       &docker-env
-  image:                           ${REGISTRY}/ink-ci-linux:latest
+  image:                           paritytech/ink-ci-linux:latest
   before_script:
     - cargo -vV
     - rustc -vV
@@ -36,13 +36,12 @@ variables:
     - bash --version
     - ./scripts/pre_cache.sh
     - sccache -s
-  only:
-    - master
-    - /^v[0-9]+\.[0-9]+.*$/        # i.e. v1.0, v2.1rc1
-    - schedules
-    - web
-    - branches
-  dependencies:                    []
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_REF_NAME == "master"
+    - if: $CI_COMMIT_REF_NAME == "tags"
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   interruptible:                   true
   retry:
     max: 2
@@ -79,7 +78,8 @@ build-std:
   stage:                           workspace
   <<:                              *docker-env
   needs:
-    - check-std
+    - job:                         check-std
+      artifacts:                   false
   script:
     - for crate in ${ALL_CRATES}; do
         cargo build --verbose --all-features --release --manifest-path ${crate}/Cargo.toml;
@@ -89,7 +89,8 @@ build-wasm:
   stage:                           workspace
   <<:                              *docker-env
   needs:
-    - check-wasm
+    - job:                         check-wasm
+      artifacts:                   false
   script:
     - for crate in ${ALL_CRATES}; do
         cargo build --verbose --no-default-features --release --target wasm32-unknown-unknown --manifest-path ${crate}/Cargo.toml;
@@ -99,7 +100,8 @@ test:
   stage:                           workspace
   <<:                              *docker-env
   needs:
-    - check-std
+    - job:                         check-std
+      artifacts:                   false
   script:
     - cargo test --verbose --all-features --no-fail-fast --workspace
 
@@ -107,7 +109,8 @@ codecov:
   stage:                           workspace
   <<:                              *docker-env
   needs:
-    - check-std
+    - job:                         check-std
+      artifacts:                   false
   variables:
     # Variables partly came from https://github.com/mozilla/grcov/blob/master/README.md
     CARGO_INCREMENTAL:             0
@@ -140,7 +143,8 @@ clippy-std:
   stage:                           workspace
   <<:                              *docker-env
   needs:
-    - check-std
+    - job:                         check-std
+      artifacts:                   false
   script:
     - for crate in ${ALL_CRATES}; do
         cargo clippy --verbose --all-features --manifest-path ${crate}/Cargo.toml -- -D warnings;
@@ -150,7 +154,8 @@ clippy-wasm:
   stage:                           workspace
   <<:                              *docker-env
   needs:
-    - check-wasm
+    - job:                         check-wasm
+      artifacts:                   false
   script:
     - for crate in ${ALL_CRATES}; do
         cargo clippy --verbose --no-default-features --manifest-path ${crate}/Cargo.toml --target wasm32-unknown-unknown -- -D warnings;
@@ -176,7 +181,8 @@ examples-test:
   stage:                           examples
   <<:                              *docker-env
   needs:
-    - clippy-std
+    - job:                         clippy-std
+      artifacts:                   false
   script:
     - for example in examples/*/; do
         cargo test --verbose --manifest-path ${example}/Cargo.toml;
@@ -194,7 +200,8 @@ examples-clippy-std:
   stage:                           examples
   <<:                              *docker-env
   needs:
-    - clippy-std
+    - job:                         clippy-std
+      artifacts:                   false
   script:
     - for example in examples/*/; do
         cargo clippy --verbose --manifest-path ${example}/Cargo.toml -- -D warnings;
@@ -223,7 +230,8 @@ examples-generate-metadata:
   stage:                           examples
   <<:                              *docker-env
   needs:
-    - build-wasm
+    - job:                         build-wasm
+      artifacts:                   false
   script:
     - *update-cargo-contract
     - for example in examples/*/; do
@@ -239,10 +247,11 @@ publish-docs:
   <<:                              *docker-env
   variables:
     GIT_DEPTH:                     0
-  only:
-    - master
-    - schedules
-    - tags
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_REF_NAME == "master"
+    - if: $CI_COMMIT_REF_NAME == "tags"
   script:
     - rm -rf /tmp/*
     - unset CARGO_TARGET_DIR

From 7bd0e85a7ecc8f8934a13aae80f3921da4dc0511 Mon Sep 17 00:00:00 2001
From: Denis P <denis.pisarev@parity.io>
Date: Tue, 29 Sep 2020 19:52:02 +0200
Subject: [PATCH 2/2] change (CI): some order

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d8ef8e672..8825a11e9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,8 @@ stages:
 variables:
   GIT_STRATEGY:                    fetch
   GIT_DEPTH:                       100
-  CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
   CARGO_INCREMENTAL:               0
+  CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
   CARGO_TARGET_DIR:                "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}"
   ALL_CRATES:                      "core core/derive alloc prelude primitives lang lang/macro lang/ir"