From 3e9e5e1bac1c80547312763f250c3160579b9239 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Tue, 7 Apr 2020 09:25:57 +0200
Subject: [PATCH] change (ci): merge check warnings into test linux job (#5546)

* change (ci): merge check warnings into test linux job

* change (ci): newline doesn't make sense here
---
 substrate/.gitlab-ci.yml | 34 +++++++---------------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/substrate/.gitlab-ci.yml b/substrate/.gitlab-ci.yml
index ddbd74d1bf..b9f30dc8aa 100644
--- a/substrate/.gitlab-ci.yml
+++ b/substrate/.gitlab-ci.yml
@@ -196,14 +196,14 @@ test-linux-stable:                 &test-linux
     - WASM_BUILD_NO_COLOR=1 time cargo test --all --release --verbose --locked |&
         tee output.log
     - sccache -s
-  after_script:
-    - echo "___Collecting warnings for check_warnings job___"
+    - echo "____Test job successful, checking for warnings____"
     - awk '/^warning:/,/^$/ { print }' output.log > ${CI_COMMIT_SHORT_SHA}_warnings.log
-  artifacts:
-    name:                          $CI_COMMIT_SHORT_SHA
-    expire_in:                     3 days
-    paths:
-      - ${CI_COMMIT_SHORT_SHA}_warnings.log
+    - if [ -s ${CI_COMMIT_SHORT_SHA}_warnings.log ]; then
+        cat ${CI_COMMIT_SHORT_SHA}_warnings.log;
+        exit 1;
+      else
+        echo "___No warnings___";
+      fi
 
 test-dependency-rules:
   stage:                           test
@@ -417,26 +417,6 @@ build-rust-doc-release:
     - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
     - sccache -s
 
-check_warnings:
-  stage:                           build
-  <<:                              *docker-env
-  except:
-    variables:
-      - $DEPLOY_TAG
-  variables:
-    GIT_STRATEGY:                  none
-  needs:
-    - job:                         test-linux-stable
-      artifacts:                   true
-  script:
-    - if [ -s ${CI_COMMIT_SHORT_SHA}_warnings.log ]; then
-        cat ${CI_COMMIT_SHORT_SHA}_warnings.log;
-        exit 1;
-      else
-        echo "___No warnings___";
-      fi
-
-
 check-polkadot-companion-status:
   stage:                           post-build-test
   image:                           parity/tools:latest