From 742a6007fec36b053c802debf89dd114c5be6840 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 7 Mar 2019 14:45:35 +0300
Subject: [PATCH] Revert "CI aws git checkout (#10451)" (#10456)

* Revert "CI aws git checkout (#10451)"

This reverts commit 3e1d73126c41779e36a05383a4278822ccc6023a.

* Update .gitlab-ci.yml

revert aws script with small fixes

* Delete publish-aws.sh
---
 .gitlab-ci.yml                | 20 ++++++++++++++++++--
 scripts/gitlab/publish-aws.sh | 18 ------------------
 2 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100755 scripts/gitlab/publish-aws.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 579d04637..198856423 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,10 @@ variables:
   CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
 
+.no_git:                           &no_git #disable git strategy
+  variables:
+    GIT_STRATEGY:                  none
+    GIT_SUBMODULE_STRATEGY:        none
 
 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
   only:                            &releaseable_branches
@@ -21,7 +25,7 @@ variables:
     - schedules
 
 
-.collect_artifacts:                &collect_artifacts
+.collect_artifacts:                &collect_artifacts 
   artifacts:
     name:                          "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}"
     when:                          on_success
@@ -164,13 +168,25 @@ publish-awss3-release:
   image:                           parity/awscli:latest
   stage:                           publish
   only:                            *releaseable_branches
+  <<:                              *no_git
   cache:                           {}
   dependencies:
     - build-linux
     - build-darwin
     - build-windows
   script:
-    - scripts/gitlab/publish-aws.sh
+    - 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
   tags:
     - linux-docker
 
diff --git a/scripts/gitlab/publish-aws.sh b/scripts/gitlab/publish-aws.sh
deleted file mode 100755
index 56572657b..000000000
--- a/scripts/gitlab/publish-aws.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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)
-      BUCKET=releases.parity.io/ethereum;
-      ;;
-    (*)
-      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