From d9d506db57a64501155458ec877a1767499d554b Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 19 Aug 2016 12:18:37 +0700
Subject: [PATCH] Update gitlab-ci

remove CC&CXX env from beta branch
---
 .gitlab-ci.yml | 59 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83aca7570..6beaa2789 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,11 @@ cache:
 linux-beta:
   stage: build
   image: ethcore/rust:beta
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
     - cargo build --release --verbose
     - strip target/release/parity
@@ -24,6 +29,11 @@ linux-beta:
 linux-stable:
   stage: build
   image: ethcore/rust:stable
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
     - cargo build --release --verbose
     - strip target/release/parity
@@ -37,6 +47,11 @@ linux-stable:
 linux-nightly:
   stage: build
   image: ethcore/rust:nightly
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
     - cargo build --release --verbose
     - strip target/release/parity
@@ -50,6 +65,11 @@ linux-nightly:
 linux-centos:
   stage: build
   image: ethcore/rust-centos:latest
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
     - export CXX="g++"
     - export CC="gcc"
@@ -65,9 +85,12 @@ linux-centos:
 linux-armv7:
   stage: build
   image: ethcore/rust-arm:latest
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
-    - export CXX=arm-linux-gnueabihf-g++
-    - export CC=arm-linux-gnueabihf-gcc
     - mkdir -p .cargo
     - echo "[target.armv7-unknown-linux-gnueabihf]" >> .cargo/config
     - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
@@ -84,9 +107,12 @@ linux-armv7:
 linux-arm:
   stage: build
   image: ethcore/rust-arm:latest
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
-    - export CXX=arm-linux-gnueabihf-g++
-    - export CC=arm-linux-gnueabihf-gcc
     - mkdir -p .cargo
     - echo "[target.arm-unknown-linux-gnueabihf]" >> .cargo/config
     - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
@@ -103,9 +129,12 @@ linux-arm:
 linux-armv6:
   stage: build
   image: ethcore/rust-arm:latest
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
-    - export CXX=arm-linux-gnueabi-g++
-    - export CC=arm-linux-gnueabi-gcc
     - mkdir -p .cargo
     - echo "[target.arm-unknown-linux-gnueabi]" >> .cargo/config
     - echo "linker= \"arm-linux-gnueabi-gcc\"" >> .cargo/config
@@ -122,9 +151,12 @@ linux-armv6:
 linux-aarch64:
   stage: build
   image: ethcore/rust-arm:latest
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
-    - export CXX=aarch64-linux-gnu-g++
-    - export CC=aarch64-linux-gnu-gcc
     - mkdir -p .cargo
     - echo "[target.aarch64-unknown-linux-gnu]" >> .cargo/config
     - echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
@@ -140,6 +172,11 @@ linux-aarch64:
     name: "${CI_BUILD_NAME}_parity"
 darwin:
   stage: build
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
     - cargo build --release --verbose
   tags:
@@ -150,11 +187,15 @@ darwin:
     name: "${CI_BUILD_NAME}_parity"
 windows:
   stage: build
+  only:
+    - master
+    - beta
+    - tags
+    - stable
   script:
     - set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt
     - set LIB=C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64
     - set RUST_BACKTRACE=1
-    - SET
     - rustup default stable-x86_64-pc-windows-msvc
     - cargo build --release --verbose
   tags: