From c584221fa2feb03c7106504363cfd435253c9376 Mon Sep 17 00:00:00 2001
From: Afri Schoedon <5chdn@users.noreply.github.com>
Date: Tue, 27 Nov 2018 12:51:27 +0100
Subject: [PATCH]  ci: rearrange pipeline by logic (#9970)

* ci: rearrange pipeline by logic

* ci: rename docs script
---
 .gitlab-ci.yml                                | 22 ++++++++++---------
 .../{docs-jsonrpc.sh => publish-docs.sh}      |  0
 2 files changed, 12 insertions(+), 10 deletions(-)
 rename scripts/gitlab/{docs-jsonrpc.sh => publish-docs.sh} (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9063ac88a..e2cb77606 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,13 @@ test-linux:
   tags:
     - rust-stable
 
+test-audit:
+  stage:                           test
+  script:
+    - scripts/gitlab/cargo-audit.sh
+  tags:
+    - rust-stable
+
 build-linux:
   stage:                           build
   only:                            *releaseable_branches
@@ -104,25 +111,18 @@ publish-awss3:
   tags:
     - shell
 
-docs-jsonrpc:
-  stage:                            optional
+publish-docs:
+  stage:                            publish
   only:
     - tags
   except:
     - nightly
   cache: {}
   script:
-    - scripts/gitlab/docs-jsonrpc.sh
+    - scripts/gitlab/publish-docs.sh
   tags:
     - shell
 
-cargo-audit:
-  stage:                           optional
-  script:
-    - scripts/gitlab/cargo-audit.sh
-  tags:
-    - rust-stable
-
 build-android:
   stage:                           optional
   image:                           parity/rust-android:gitlab-ci
@@ -132,6 +132,7 @@ build-android:
     - scripts/gitlab/build-unix.sh
   tags:
     - rust-arm
+  allow_failure:                   true
 
 test-beta:
   stage:                           optional
@@ -141,6 +142,7 @@ test-beta:
     - scripts/gitlab/test-all.sh beta
   tags:
     - rust-beta
+  allow_failure:                   true
 
 test-nightly:
   stage:                           optional
diff --git a/scripts/gitlab/docs-jsonrpc.sh b/scripts/gitlab/publish-docs.sh
similarity index 100%
rename from scripts/gitlab/docs-jsonrpc.sh
rename to scripts/gitlab/publish-docs.sh