From a835c13e6b56077a9a2f95b81f8ecf7370ca19be Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Tue, 23 Jan 2018 06:20:22 +0300
Subject: [PATCH] add docker build for stable and cargo cache (#7672)

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90e59f9c9..fc8322197 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ variables:
   CARGOFLAGS: ""
   CI_SERVER_NAME: "GitLab CI"
   LIBSSL: "libssl1.0.0 (>=1.0.0)"
+  CARGO_HOME: "$CI_PROJECT_DIR"
 cache:
   key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
   paths:
@@ -18,9 +19,9 @@ linux-stable:
   stage: build
   image: parity/rust:gitlab-ci
   only:
+    - stable
     - beta
     - tags
-    - stable
     - triggers
   script:
     - rustup default stable
@@ -36,9 +37,9 @@ linux-stable-debian:
   stage: build
   image: parity/rust-debian:gitlab-ci
   only:
+    - stable
     - beta
     - tags
-    - stable
     - triggers
   script:
     - export LIBSSL="libssl1.1 (>=1.1.0)"
@@ -53,9 +54,9 @@ linux-centos:
   stage: build
   image: parity/rust-centos:gitlab-ci
   only:
+    - stable
     - beta
     - tags
-    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++
@@ -69,9 +70,9 @@ linux-i686:
   stage: build
   image: parity/rust-i686:gitlab-ci
   only:
+    - stable
     - beta
     - tags
-    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++
@@ -85,9 +86,9 @@ linux-armv7:
   stage: build
   image: parity/rust-armv7:gitlab-ci
   only:
+    - stable
     - beta
     - tags
-    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++
@@ -101,9 +102,9 @@ linux-arm:
   stage: build
   image: parity/rust-arm:gitlab-ci
   only:
+    - stable
     - beta
     - tags
-    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++
@@ -117,9 +118,9 @@ linux-aarch64:
   stage: build
   image: parity/rust-arm64:gitlab-ci
   only:
+    - stable
     - beta
     - tags
-    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++
@@ -149,9 +150,9 @@ linux-snap:
 darwin:
   stage: build
   only:
+    - stable
     - beta
     - tags
-    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++
@@ -167,9 +168,9 @@ windows:
     untracked: true
   stage: build
   only:
+    - stable
     - beta
     - tags
-    - stable
     - triggers
   script:
     - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" ""
@@ -182,6 +183,8 @@ windows:
 docker-build:
   stage: build
   only:
+    - stable
+    - beta
     - tags
     - triggers
   before_script:
@@ -244,8 +247,8 @@ js-release:
   stage: js-build
   only:
     - master
-    - beta
     - stable
+    - beta
     - tags
     - triggers
   image: parity/rust:gitlab-ci