From 1c4f5b98a5d5691e5991e590d7a655d96dee6661 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Wed, 7 Sep 2016 23:49:44 +0700
Subject: [PATCH 1/4] Update gitlab-ci

---
 .gitlab-ci.yml | 92 ++++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65e60d6eb..bb7f9896e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,25 @@ variables:
 cache:
   key: "$CI_BUILD_NAME/$CI_BUILD_REF_NAME"
   untracked: true
+linux-stable:
+  stage: build
+  image: ethcore/rust:stable
+  only:
+    - master
+    - beta
+    - tags
+    - stable
+  script:
+    - export
+    - cargo build --release --verbose
+    - strip target/release/parity
+  tags:
+    - rust
+    - rust-stable
+  artifacts:
+    paths:
+    - target/release/parity
+    name: "${CI_BUILD_NAME}_parity"
 linux-beta:
   stage: build
   image: ethcore/rust:beta
@@ -29,12 +48,6 @@ linux-beta:
     paths:
     - target/release/parity
     name: "${CI_BUILD_NAME}_parity"
-  stage: deploy
-  tags:
-    - rust
-    - rust-beta
-  script:
-    - ./deploy.sh
 linux-nightly:
   stage: build
   image: ethcore/rust:nightly
@@ -84,11 +97,11 @@ linux-armv7:
     - stable
   script:
     - export
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.armv7-unknown-linux-gnueabihf]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    - cat .cargo/config
+    #- rm -rf .cargo
+    #- mkdir -p .cargo
+    #- echo "[target.armv7-unknown-linux-gnueabihf]" >> .cargo/config
+    #- echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
+    #- cat .cargo/config
     - cargo build --target armv7-unknown-linux-gnueabihf --release --verbose
     - arm-linux-gnueabihf-strip target/armv7-unknown-linux-gnueabihf/release/parity
   tags:
@@ -108,11 +121,11 @@ linux-arm:
     - stable
   script:
     - export
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.arm-unknown-linux-gnueabihf]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    - cat .cargo/config
+    #- rm -rf .cargo
+    #- mkdir -p .cargo
+    #- echo "[target.arm-unknown-linux-gnueabihf]" >> .cargo/config
+    #- echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
+    #- cat .cargo/config
     - cargo build --target arm-unknown-linux-gnueabihf --release --verbose
     - arm-linux-gnueabihf-strip target/arm-unknown-linux-gnueabihf/release/parity
   tags:
@@ -133,11 +146,11 @@ linux-armv6:
     - stable
   script:
     - export
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.arm-unknown-linux-gnueabi]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabi-gcc\"" >> .cargo/config
-    - cat .cargo/config
+    #- rm -rf .cargo
+    #- mkdir -p .cargo
+    #- echo "[target.arm-unknown-linux-gnueabi]" >> .cargo/config
+    #- echo "linker= \"arm-linux-gnueabi-gcc\"" >> .cargo/config
+    #- cat .cargo/config
     - cargo build --target arm-unknown-linux-gnueabi --release --verbose
     - arm-linux-gnueabi-strip target/arm-unknown-linux-gnueabi/release/parity
   tags:
@@ -158,11 +171,11 @@ linux-aarch64:
     - stable
   script:
     - export
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.aarch64-unknown-linux-gnu]" >> .cargo/config
-    - echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
-    - cat .cargo/config
+    #- rm -rf .cargo
+    #- mkdir -p .cargo
+    #- echo "[target.aarch64-unknown-linux-gnu]" >> .cargo/config
+    #- echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
+    #- cat .cargo/config
     - cargo build --target aarch64-unknown-linux-gnu --release --verbose
     - aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/parity
   tags:
@@ -208,30 +221,19 @@ windows:
     - target/release/parity.exe
     - target/release/parity.pdb
     name: "${CI_BUILD_NAME}_parity"
-linux-stable:
-  stage: build
-  image: ethcore/rust:stable
-  only:
-    - master
-    - beta
-    - tags
-    - stable
-  script:
-    - export
-    - cargo build --release --verbose
-    - strip target/release/parity
-  tags:
-    - rust
-    - rust-stable
-  artifacts:
-    paths:
-    - target/release/parity
-    name: "${CI_BUILD_NAME}_parity"
 test-linux:
   stage: test
+  image: ethcore/rust:stable
   before_script:
     - git submodule update --init --recursive
   script:
     - ./test.sh --verbose
+  tags:
+    - rust
+    - rust-stable
   dependencies:
     - linux-stable
+deploy-binaries:
+  stage: deploy
+  script:
+    - ./deploy.sh

From a2f475986f9b293b80bc5aebd38a9edc8ac86634 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 8 Sep 2016 00:26:18 +0700
Subject: [PATCH 2/4] Update gitlab-ci

add allow_failure: true to armv7
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb7f9896e..033a89bed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,6 +111,7 @@ linux-armv7:
     paths:
     - target/armv7-unknown-linux-gnueabihf/release/parity
     name: "${CI_BUILD_NAME}_parity"
+  allow_failure: true
 linux-arm:
   stage: build
   image: ethcore/rust-arm:latest

From ebad54a3a6c9b96a4395a198335736a116676baa Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 8 Sep 2016 01:47:34 +0700
Subject: [PATCH 3/4] Update gitlab-ci

replace test with build and add CXX to armv7
---
 .gitlab-ci.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 033a89bed..1666b16c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 stages:
-  - build
   - test
+  - build
   - deploy
 variables:
   GIT_DEPTH: "3"
@@ -97,11 +97,12 @@ linux-armv7:
     - stable
   script:
     - export
-    #- rm -rf .cargo
-    #- mkdir -p .cargo
-    #- echo "[target.armv7-unknown-linux-gnueabihf]" >> .cargo/config
-    #- echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    #- cat .cargo/config
+    - export CXX="arm-linux-gnueabihf-g++"
+    - rm -rf .cargo
+    - mkdir -p .cargo
+    - echo "[target.armv7-unknown-linux-gnueabihf]" >> .cargo/config
+    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
+    - cat .cargo/config
     - cargo build --target armv7-unknown-linux-gnueabihf --release --verbose
     - arm-linux-gnueabihf-strip target/armv7-unknown-linux-gnueabihf/release/parity
   tags:

From 012a1f328b7850acae60298fdd3e02b8aa32df6d Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 8 Sep 2016 01:50:05 +0700
Subject: [PATCH 4/4] Update gitlab-ci

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1666b16c8..59c709747 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 stages:
-  - test
   - build
+  - test
   - deploy
 variables:
   GIT_DEPTH: "3"