From 8bbae937aceac510e698b25664f34345bf9a6dbd Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Thu, 18 Jul 2019 14:00:37 +0200
Subject: [PATCH 1/3] Add Avast AV whitelisting publish script

---
 .gitlab-ci.yml                          | 17 ++++++++++++++++-
 scripts/gitlab/publish-av-whitelists.sh | 17 +++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100755 scripts/gitlab/publish-av-whitelists.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b8dc0773c6..f940258495b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -193,7 +193,7 @@ build-darwin:
 build-windows:
   stage:                           build
   <<:                              *collect_artifacts
-  only:                            *releaseable_branches
+  # only:                            *releaseable_branches
   variables:
     CARGO_TARGET:                  x86_64-pc-windows-msvc
     CARGO_HOME:                    "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME"
@@ -323,3 +323,18 @@ publish-docs:
   tags:
     - linux-docker
   allow_failure:                   true
+
+publish-av-whitelist:
+  stage:                          publish
+  <<:                             *no_git
+  # only:                           *releaseable_branches
+  except:
+    variables:
+      - $SCHEDULE_TAG == "nightly"
+  cache:                          {}
+  dependencies:
+    - build-windows
+  script:
+    - scripts/gitlab/publish-av-whitelists.sh
+  tags:
+    - linux-docker
diff --git a/scripts/gitlab/publish-av-whitelists.sh b/scripts/gitlab/publish-av-whitelists.sh
new file mode 100755
index 00000000000..ab67bd09836
--- /dev/null
+++ b/scripts/gitlab/publish-av-whitelists.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+echo "__________Publish Windows binaries to Avast Whitelisting program__________"
+
+target_filename="parity-${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}.exe"
+apt -y update
+apt -y install ftp
+ls ./artifacts
+ftp -pinv whitelisting.avast.com <<EOF
+quote USER ftp_parityio
+quote PASS $avast_ftp_password
+cd /share
+put ./artifacts/x86_64-pc-windows-msvc/parity.exe $target_filename
+bye
+EOF
+

From 90eef555e7e5c47bb98c7fe4a1019d7c9d4b831b Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Thu, 18 Jul 2019 15:17:12 +0200
Subject: [PATCH 2/3] Update gitlab-ci.yml, publish-av-whitelists.sh

---
 .gitlab-ci.yml                          | 2 +-
 scripts/gitlab/publish-av-whitelists.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f940258495b..430a281b083 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -193,7 +193,7 @@ build-darwin:
 build-windows:
   stage:                           build
   <<:                              *collect_artifacts
-  # only:                            *releaseable_branches
+  only:                            *releaseable_branches
   variables:
     CARGO_TARGET:                  x86_64-pc-windows-msvc
     CARGO_HOME:                    "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME"
diff --git a/scripts/gitlab/publish-av-whitelists.sh b/scripts/gitlab/publish-av-whitelists.sh
index ab67bd09836..cbedbb350de 100755
--- a/scripts/gitlab/publish-av-whitelists.sh
+++ b/scripts/gitlab/publish-av-whitelists.sh
@@ -3,7 +3,7 @@ set -e
 
 echo "__________Publish Windows binaries to Avast Whitelisting program__________"
 
-target_filename="parity-${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}.exe"
+target_filename="parity-${CI_COMMIT_TAG:-${CI_COMMIT_REF_NAME}}.exe"
 apt -y update
 apt -y install ftp
 ls ./artifacts

From b1b120699f1c9b5cadb72e66d7b41f3140fcd459 Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Thu, 18 Jul 2019 15:20:16 +0200
Subject: [PATCH 3/3] remove debug print

---
 scripts/gitlab/publish-av-whitelists.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/gitlab/publish-av-whitelists.sh b/scripts/gitlab/publish-av-whitelists.sh
index cbedbb350de..e5d1db1d8fe 100755
--- a/scripts/gitlab/publish-av-whitelists.sh
+++ b/scripts/gitlab/publish-av-whitelists.sh
@@ -6,7 +6,6 @@ echo "__________Publish Windows binaries to Avast Whitelisting program__________
 target_filename="parity-${CI_COMMIT_TAG:-${CI_COMMIT_REF_NAME}}.exe"
 apt -y update
 apt -y install ftp
-ls ./artifacts
 ftp -pinv whitelisting.avast.com <<EOF
 quote USER ftp_parityio
 quote PASS $avast_ftp_password