From 1bd45642167b567f2890ba8854b93d5d3486c93a Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Mon, 4 Mar 2019 21:59:20 +0300
Subject: [PATCH] CI publish to aws (#10446)

* move publish aws from gitlab.yml to gitlab scripts

* gitlab.yml cleaning
move publish AWS to gitlab scripts
remove dependencies from android build
---
 .gitlab-ci.yml                | 15 ++-------------
 scripts/gitlab/publish-aws.sh | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100755 scripts/gitlab/publish-aws.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73dbf5ce0..71019c387 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -176,19 +176,7 @@ publish-awss3-release:
     - build-darwin
     - build-windows
   script:
-    - echo "__________Push binaries to AWS S3____________"
-    - case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
-        (beta|stable|nightly)
-          export BUCKET=releases.parity.io/ethereum;
-          ;;
-        (*)
-          export BUCKET=builds-parity;
-          ;;
-      esac
-    - aws s3 sync ./artifacts s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
-  after_script:
-    - aws s3 ls s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
-        --recursive --human-readable --summarize
+    - scripts/gitlab/publish-aws.sh
   tags:
     - linux-docker
 
@@ -209,6 +197,7 @@ build-android:
   image:                           parity/rust-android:gitlab-ci
   variables:
     CARGO_TARGET:                  armv7-linux-androideabi
+  dependencies:
   script:
     - scripts/gitlab/build-unix.sh
   tags:
diff --git a/scripts/gitlab/publish-aws.sh b/scripts/gitlab/publish-aws.sh
new file mode 100755
index 000000000..395a3bd77
--- /dev/null
+++ b/scripts/gitlab/publish-aws.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+
+echo "__________Push binaries to AWS S3____________"
+case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
+    (beta|stable|nightly)
+      export BUCKET=releases.parity.io/ethereum;
+      ;;
+    (*)
+      export BUCKET=builds-parity;
+      ;;
+  esac
+aws s3 sync ./artifacts s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
+echo "__________Read from S3____________"
+aws s3 ls s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
+    --recursive --human-readable --summarize