From 0ce02217cb89e0d8b9c4e459b0313452acd00a15 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:20:26 +0100
Subject: [PATCH 01/23] ci: enable snap publishing~

---
 .gitlab-ci.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2cb77606d8..28a49101849 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,6 @@ test-audit:
 build-linux:
   stage:                           build
   only:                            *releaseable_branches
-  variables:
-    CARGO_TARGET:                  x86_64-unknown-linux-gnu
   script:
     - scripts/gitlab/build-unix.sh
   <<:                              *collect_artifacts
@@ -97,6 +95,20 @@ publish-docker:
   script:
     - scripts/gitlab/publish-docker.sh parity
 
+publish-snap:
+  stage:                           publish
+  only:                            *releaseable_branches
+  image:                           parity/snapcraft:gitlab-ci
+  cache: {}
+  before_script:                   *determine_version
+  dependencies:
+    - build-linux
+  tags:
+    - rust-stable
+  script:
+    - scripts/gitlab/publish-snap.sh
+  <<:                              *collect_artifacts
+
 publish-awss3:
   stage:                           publish
   only:                            *releaseable_branches

From 73a0869ea76063e260a663f81f0365cf14eb31ab Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:20:51 +0100
Subject: [PATCH 02/23] ci: add publish snap script

---
 scripts/gitlab/publish-snap.sh | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 scripts/gitlab/publish-snap.sh

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
new file mode 100755
index 00000000000..057f5ba395b
--- /dev/null
+++ b/scripts/gitlab/publish-snap.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+
+case ${CI_COMMIT_REF_NAME} in
+  nightly|*v2.3*) export GRADE="devel" && export CHANNEL="edge";;
+  beta|*v2.2*) export GRADE="stable" && export CHANNEL="beta";;
+  stable|*v2.1*) export GRADE="stable" && export CHANNEL="stable";;
+  *) echo "No release" exit 0;;
+esac
+
+SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"
+
+echo "__________Create snap package__________"
+echo "Release channel :" $GRADE " Branch/tag: " $CI_COMMIT_REF_NAME
+echo $VERSION:$GRADE:$BUILD_ARCH
+cat scripts/snap/snapcraft.template.yaml | envsubst '$VERSION:$GRADE:$BUILD_ARCH:$CARGO_TARGET' > snapcraft.yaml
+cat snapcraft.yaml
+snapcraft --target-arch=$BUILD_ARCH
+ls *.snap
+echo "_____ Calculating checksums _____"
+rhash --sha256 $SNAP_PACKAGE -o $SNAP_PACKAGE".sha256"
+
+echo "Releasing snap package__________"
+echo "Release channel :" $CHANNEL " Branch/tag: " $CI_COMMIT_REF_NAME
+
+echo $SNAPCRAFT_LOGIN_PARITY_BASE64 | base64 --decode > snapcraft.login
+snapcraft login --with snapcraft.login
+snapcraft push --release $CHANNEL $SNAP_PACKAGE
+snapcraft status parity
+snapcraft logout

From 2ea98b759cf45d629a39f9acc8b4a46b3b1d849a Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:21:11 +0100
Subject: [PATCH 03/23] ci: add snapcraft skeleton

---
 scripts/snap/icon.png                | Bin 0 -> 5044 bytes
 scripts/snap/parity.desktop          |   8 ++++
 scripts/snap/snapcraft.template.yaml |  57 +++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 scripts/snap/icon.png
 create mode 100644 scripts/snap/parity.desktop
 create mode 100644 scripts/snap/snapcraft.template.yaml

diff --git a/scripts/snap/icon.png b/scripts/snap/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f22390f5629c9a746d7b54e359ca8a66fefd4b
GIT binary patch
literal 5044
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

literal 0
HcmV?d00001

diff --git a/scripts/snap/parity.desktop b/scripts/snap/parity.desktop
new file mode 100644
index 00000000000..1833865deab
--- /dev/null
+++ b/scripts/snap/parity.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Parity Ethereum
+Comment=The fastest and most advanced Ethereum client.
+Exec=parity
+Icon=/usr/share/pixmaps/icon.png
+Terminal=true
diff --git a/scripts/snap/snapcraft.template.yaml b/scripts/snap/snapcraft.template.yaml
new file mode 100644
index 00000000000..881871079df
--- /dev/null
+++ b/scripts/snap/snapcraft.template.yaml
@@ -0,0 +1,57 @@
+name:               parity
+version:            $VERSION
+architectures:      [$BUILD_ARCH]
+grade:              $GRADE
+confinement:        strict
+
+summary:            Fast, light, robust Ethereum implementation
+description:        |
+  Parity's goal is to be the fastest, lightest, and most secure Ethereum
+  client. We are developing Parity using the sophisticated and cutting-edge
+  Rust programming language. Parity is licensed under the GPLv3, and can be
+  used for all your Ethereum needs.
+
+apps:
+  parity:
+    command:        parity
+    plugs:          [home, network, network-bind, mount-observe, x11, unity7, desktop, desktop-legacy, wayland]
+    desktop:        ./usr/share/applications/parity.desktop
+  parity-evm:
+    command:        parity-evm
+    plugs:          [home, network, network-bind]
+  ethkey:
+    command:        ethkey
+    plugs:          [home]
+  ethstore:
+    command:        ethstore
+    plugs:          [home]
+  whisper:
+    command:        whisper
+    plugs:          [home, network-bind]
+
+icon:               ./scripts/snap/icon.png
+
+parts:
+  desktop-icon:
+    source:         ./scripts/snap
+    plugin:         nil
+    override-build:        |
+      mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
+      cp -v ./parity.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/
+      cp -v ./icon.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/
+  parity:
+    source:         ./artifacts/$CARGO_TARGET
+    plugin:         nil
+    override-build:        |
+      mkdir -p $SNAPCRAFT_PART_INSTALL/usr/bin
+      cp -v parity $SNAPCRAFT_PART_INSTALL/usr/bin/parity
+      cp -v parity-evm $SNAPCRAFT_PART_INSTALL/usr/bin/parity-evm
+      cp -v ethkey $SNAPCRAFT_PART_INSTALL/usr/bin/ethkey
+      cp -v ethstore $SNAPCRAFT_PART_INSTALL/usr/bin/ethstore
+      cp -v whisper $SNAPCRAFT_PART_INSTALL/usr/bin/whisper
+    stage-packages: [libc6, libudev1, libstdc++6, cmake]
+  df:
+    plugin:         nil
+    stage-packages: [coreutils]
+    stage:          [bin/df]

From 89c947a46d39e26aa1ab06c69ed6c82a798cb275 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:28:42 +0100
Subject: [PATCH 04/23] ci: group export statements

---
 scripts/gitlab/publish-snap.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 057f5ba395b..1912b5aac44 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -4,9 +4,9 @@ set -e # fail on any error
 set -u # treat unset variables as error
 
 case ${CI_COMMIT_REF_NAME} in
-  nightly|*v2.3*) export GRADE="devel" && export CHANNEL="edge";;
-  beta|*v2.2*) export GRADE="stable" && export CHANNEL="beta";;
-  stable|*v2.1*) export GRADE="stable" && export CHANNEL="stable";;
+  nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
+  beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;
+  stable|*v2.1*) export GRADE="stable" CHANNEL="stable";;
   *) echo "No release" exit 0;;
 esac
 

From 14554182866a86738d206b6d2d3931d882eb2507 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:31:28 +0100
Subject: [PATCH 05/23] ci: enable snaps on pr branch

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28a49101849..10f85b50b2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,7 +97,9 @@ publish-docker:
 
 publish-snap:
   stage:                           publish
-  only:                            *releaseable_branches
+  only:
+    - a5-ci-snapcraft
+    - pr-10142
   image:                           parity/snapcraft:gitlab-ci
   cache: {}
   before_script:                   *determine_version

From e6c9ee2fae3e43981e95387fc4563cd022d9c6e1 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:32:55 +0100
Subject: [PATCH 06/23] ci: enable snaps on pr branch

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10f85b50b2d..cd1008c93db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,6 @@ test-audit:
 
 build-linux:
   stage:                           build
-  only:                            *releaseable_branches
   script:
     - scripts/gitlab/build-unix.sh
   <<:                              *collect_artifacts

From d4e44b068f039c7404065b0ac77865656611b03d Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:57:14 +0100
Subject: [PATCH 07/23] ci: set default BUILD_ARCH

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd1008c93db..d6e06914c93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ variables:
   CI_SERVER_NAME:                  "GitLab CI"
   CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
+  BUILD_ARCH:                      amd64
 
 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
   only:                            &releaseable_branches

From 0eac04edadd60f30868eaf949f9688108d8852da Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:58:27 +0100
Subject: [PATCH 08/23] ci: enable snaps on pr branch

---
 scripts/gitlab/publish-snap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 1912b5aac44..addd1ffcec6 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -4,6 +4,7 @@ set -e # fail on any error
 set -u # treat unset variables as error
 
 case ${CI_COMMIT_REF_NAME} in
+  a5-ci-snapcraft|pr-10142) export GRADE="devel" CHANNEL="edge";;
   nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
   beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;
   stable|*v2.1*) export GRADE="stable" CHANNEL="stable";;

From 08137f8be84c979699bc3b869d65208cfd1ef15c Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 13:00:05 +0100
Subject: [PATCH 09/23] ci: enable snaps on pr branch

---
 scripts/gitlab/publish-snap.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index addd1ffcec6..ff8e2f533ce 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -4,8 +4,7 @@ set -e # fail on any error
 set -u # treat unset variables as error
 
 case ${CI_COMMIT_REF_NAME} in
-  a5-ci-snapcraft|pr-10142) export GRADE="devel" CHANNEL="edge";;
-  nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
+  a5-ci-snapcraft|pr-10142|nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
   beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;
   stable|*v2.1*) export GRADE="stable" CHANNEL="stable";;
   *) echo "No release" exit 0;;

From 101d19eb90c46e137e9887ecdf7ccc5c7d54b7d6 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 14:31:33 +0100
Subject: [PATCH 10/23] ci: add libdb to snap

---
 scripts/gitlab/publish-snap.sh       | 5 +++--
 scripts/snap/snapcraft.template.yaml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index ff8e2f533ce..4eb2f867d25 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -19,10 +19,11 @@ cat scripts/snap/snapcraft.template.yaml | envsubst '$VERSION:$GRADE:$BUILD_ARCH
 cat snapcraft.yaml
 snapcraft --target-arch=$BUILD_ARCH
 ls *.snap
-echo "_____ Calculating checksums _____"
+echo "__________Calculating checksums__________"
 rhash --sha256 $SNAP_PACKAGE -o $SNAP_PACKAGE".sha256"
+cat $SNAP_PACKAGE".sha256"
 
-echo "Releasing snap package__________"
+echo "__________Releasing snap package__________"
 echo "Release channel :" $CHANNEL " Branch/tag: " $CI_COMMIT_REF_NAME
 
 echo $SNAPCRAFT_LOGIN_PARITY_BASE64 | base64 --decode > snapcraft.login
diff --git a/scripts/snap/snapcraft.template.yaml b/scripts/snap/snapcraft.template.yaml
index 881871079df..eb67ba12820 100644
--- a/scripts/snap/snapcraft.template.yaml
+++ b/scripts/snap/snapcraft.template.yaml
@@ -50,7 +50,7 @@ parts:
       cp -v ethkey $SNAPCRAFT_PART_INSTALL/usr/bin/ethkey
       cp -v ethstore $SNAPCRAFT_PART_INSTALL/usr/bin/ethstore
       cp -v whisper $SNAPCRAFT_PART_INSTALL/usr/bin/whisper
-    stage-packages: [libc6, libudev1, libstdc++6, cmake]
+    stage-packages: [libc6, libudev1, libstdc++6, cmake, libdb]
   df:
     plugin:         nil
     stage-packages: [coreutils]

From 736a9fa8837d2e6918b8203f89a269a0785acd56 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 14:35:44 +0100
Subject: [PATCH 11/23] ci: reinitiate gitlabci

---
 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6e06914c93..3c0622c28b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,6 @@ variables:
   CI_SERVER_NAME:                  "GitLab CI"
   CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
-  BUILD_ARCH:                      amd64
 
 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
   only:                            &releaseable_branches
@@ -54,6 +53,7 @@ test-audit:
 
 build-linux:
   stage:                           build
+  only:                            *releaseable_branches
   script:
     - scripts/gitlab/build-unix.sh
   <<:                              *collect_artifacts
@@ -97,10 +97,10 @@ publish-docker:
 
 publish-snap:
   stage:                           publish
-  only:
-    - a5-ci-snapcraft
-    - pr-10142
+  only:                            *releaseable_branches
   image:                           parity/snapcraft:gitlab-ci
+  variables:
+    - BUILD_ARCH:                  amd64
   cache: {}
   before_script:                   *determine_version
   dependencies:
@@ -109,6 +109,7 @@ publish-snap:
     - rust-stable
   script:
     - scripts/gitlab/publish-snap.sh
+  allow_failure:                   true
   <<:                              *collect_artifacts
 
 publish-awss3:

From 5c40721f1cc9f83a7f1f69196cba64aae0ef04c7 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 14:38:17 +0100
Subject: [PATCH 12/23] ci: reinitiate publish-snap script

---
 scripts/gitlab/publish-snap.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 4eb2f867d25..03ea2d80557 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -4,7 +4,7 @@ set -e # fail on any error
 set -u # treat unset variables as error
 
 case ${CI_COMMIT_REF_NAME} in
-  a5-ci-snapcraft|pr-10142|nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
+  nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
   beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;
   stable|*v2.1*) export GRADE="stable" CHANNEL="stable";;
   *) echo "No release" exit 0;;
@@ -19,6 +19,7 @@ cat scripts/snap/snapcraft.template.yaml | envsubst '$VERSION:$GRADE:$BUILD_ARCH
 cat snapcraft.yaml
 snapcraft --target-arch=$BUILD_ARCH
 ls *.snap
+
 echo "__________Calculating checksums__________"
 rhash --sha256 $SNAP_PACKAGE -o $SNAP_PACKAGE".sha256"
 cat $SNAP_PACKAGE".sha256"

From 287297d6d03222329143be49ee832767c168346d Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 14:41:05 +0100
Subject: [PATCH 13/23] ci: fix yaml syntax

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c0622c28b2..b2ae453cf99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,7 +100,7 @@ publish-snap:
   only:                            *releaseable_branches
   image:                           parity/snapcraft:gitlab-ci
   variables:
-    - BUILD_ARCH:                  amd64
+    BUILD_ARCH:                  amd64
   cache: {}
   before_script:                   *determine_version
   dependencies:

From 7dcf922fbe80b2fb7c0c6b38afc6243a1122c139 Mon Sep 17 00:00:00 2001
From: Denis P <pisarevden@gmail.com>
Date: Mon, 7 Jan 2019 21:33:17 +0100
Subject: [PATCH 14/23] cargo/gitlab env vars

---
 scripts/gitlab/publish-snap.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 03ea2d80557..68cb33c4f10 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -3,6 +3,9 @@
 set -e # fail on any error
 set -u # treat unset variables as error
 
+echo CI_COMMIT_REF NAME: $CI_COMMIT_REF_NAME
+echo CARGO_PKG_VERSION: $CARGO_PKG_VERSION
+
 case ${CI_COMMIT_REF_NAME} in
   nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
   beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;

From efa2da16b10e18a572f89da64c897c1963671854 Mon Sep 17 00:00:00 2001
From: Denis P <pisarevden@gmail.com>
Date: Mon, 7 Jan 2019 21:37:22 +0100
Subject: [PATCH 15/23] debug, revert me

---
 .gitlab-ci.yml                 |  4 ++--
 scripts/gitlab/publish-snap.sh | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2ae453cf99..775be44d7e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,8 +96,8 @@ publish-docker:
     - scripts/gitlab/publish-docker.sh parity
 
 publish-snap:
-  stage:                           publish
-  only:                            *releaseable_branches
+  stage:                           optional # publish
+  # only:                            *releaseable_branches
   image:                           parity/snapcraft:gitlab-ci
   variables:
     BUILD_ARCH:                  amd64
diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 68cb33c4f10..a3d9c025d76 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -30,8 +30,8 @@ cat $SNAP_PACKAGE".sha256"
 echo "__________Releasing snap package__________"
 echo "Release channel :" $CHANNEL " Branch/tag: " $CI_COMMIT_REF_NAME
 
-echo $SNAPCRAFT_LOGIN_PARITY_BASE64 | base64 --decode > snapcraft.login
-snapcraft login --with snapcraft.login
-snapcraft push --release $CHANNEL $SNAP_PACKAGE
-snapcraft status parity
-snapcraft logout
+# echo $SNAPCRAFT_LOGIN_PARITY_BASE64 | base64 --decode > snapcraft.login
+# snapcraft login --with snapcraft.login
+# snapcraft push --release $CHANNEL $SNAP_PACKAGE
+# snapcraft status parity
+# snapcraft logout

From d94181c7985c30a4127a304163a23c9412a9053b Mon Sep 17 00:00:00 2001
From: Denis P <pisarevden@gmail.com>
Date: Mon, 7 Jan 2019 21:47:43 +0100
Subject: [PATCH 16/23] version?

---
 scripts/gitlab/publish-snap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index a3d9c025d76..62ff2684324 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -4,7 +4,7 @@ set -e # fail on any error
 set -u # treat unset variables as error
 
 echo CI_COMMIT_REF NAME: $CI_COMMIT_REF_NAME
-echo CARGO_PKG_VERSION: $CARGO_PKG_VERSION
+echo VERSION: $VERSION
 
 case ${CI_COMMIT_REF_NAME} in
   nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;

From 86340aa658a674623c8312f4a00ce11a4d200e12 Mon Sep 17 00:00:00 2001
From: Denis P <pisarevden@gmail.com>
Date: Mon, 7 Jan 2019 22:24:40 +0100
Subject: [PATCH 17/23] debug vars

---
 scripts/gitlab/publish-snap.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 62ff2684324..10ec38ca37b 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -10,7 +10,8 @@ case ${CI_COMMIT_REF_NAME} in
   nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
   beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;
   stable|*v2.1*) export GRADE="stable" CHANNEL="stable";;
-  *) echo "No release" exit 0;;
+  pr|*10142*) export GRADE="debug_grade" CHANNEL="debug_channel";; # delme
+  *) echo "No release";; # exit 0;;
 esac
 
 SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"

From dbea690234f83907b094db4663cd270e935e6987 Mon Sep 17 00:00:00 2001
From: Denis P <pisarevden@gmail.com>
Date: Mon, 7 Jan 2019 23:12:44 +0100
Subject: [PATCH 18/23] vars

---
 scripts/gitlab/publish-snap.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 10ec38ca37b..04baa487d6d 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -5,13 +5,25 @@ set -u # treat unset variables as error
 
 echo CI_COMMIT_REF NAME: $CI_COMMIT_REF_NAME
 echo VERSION: $VERSION
+echo SCHEDULE_TAG-CI_COMMIT_REF_NAME: ${SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
+test "$SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}" = "nightly" 
+echo VERSION-ID_SHORT-DATE_STR: "${VERSION}-${ID_SHORT}-${DATE_STR}"
+test VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
+test "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
+
+case $ {track} in
+  nightly) export VERSION_NIGHTLY=vn;;
+  beta) export VERSION_BETA=vb;;
+  stable) export VERSION_STABLE=vs;;
+  *) echo "Non releasable track" exit 0;;
+esac
 
 case ${CI_COMMIT_REF_NAME} in
   nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
   beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;
   stable|*v2.1*) export GRADE="stable" CHANNEL="stable";;
   pr|*10142*) export GRADE="debug_grade" CHANNEL="debug_channel";; # delme
-  *) echo "No release";; # exit 0;;
+  *) echo "No release" exit 0;;
 esac
 
 SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"

From c1fbd60b91ffca4c9748027a14513330e890c32d Mon Sep 17 00:00:00 2001
From: Denis P <pisarevden@gmail.com>
Date: Mon, 7 Jan 2019 23:18:25 +0100
Subject: [PATCH 19/23] vars fix

---
 scripts/gitlab/publish-snap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 04baa487d6d..e1df3139eb9 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -5,7 +5,7 @@ set -u # treat unset variables as error
 
 echo CI_COMMIT_REF NAME: $CI_COMMIT_REF_NAME
 echo VERSION: $VERSION
-echo SCHEDULE_TAG-CI_COMMIT_REF_NAME: ${SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
+echo SCHEDULE_TAG-CI_COMMIT_REF_NAME: ${SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}"
 test "$SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}" = "nightly" 
 echo VERSION-ID_SHORT-DATE_STR: "${VERSION}-${ID_SHORT}-${DATE_STR}"
 test VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"

From 68f735a614d5de9ebbef013881bf002c34b00330 Mon Sep 17 00:00:00 2001
From: Denis P <pisarevden@gmail.com>
Date: Mon, 7 Jan 2019 23:20:01 +0100
Subject: [PATCH 20/23] vars fix

---
 scripts/gitlab/publish-snap.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index e1df3139eb9..1e55ca25399 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -5,18 +5,18 @@ set -u # treat unset variables as error
 
 echo CI_COMMIT_REF NAME: $CI_COMMIT_REF_NAME
 echo VERSION: $VERSION
-echo SCHEDULE_TAG-CI_COMMIT_REF_NAME: ${SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}"
+echo SCHEDULE_TAG-CI_COMMIT_REF_NAME: "${SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}"
 test "$SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}" = "nightly" 
 echo VERSION-ID_SHORT-DATE_STR: "${VERSION}-${ID_SHORT}-${DATE_STR}"
 test VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
 test "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
 
-case $ {track} in
-  nightly) export VERSION_NIGHTLY=vn;;
-  beta) export VERSION_BETA=vb;;
-  stable) export VERSION_STABLE=vs;;
-  *) echo "Non releasable track" exit 0;;
-esac
+# case $ {track} in
+#   nightly) export VERSION_NIGHTLY=vn;;
+#   beta) export VERSION_BETA=vb;;
+#   stable) export VERSION_STABLE=vs;;
+#   *) echo "Non releasable track" exit 0;;
+# esac
 
 case ${CI_COMMIT_REF_NAME} in
   nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;

From ea0c4def6a50cae4048f6f7aa2496f51d3b4d8c5 Mon Sep 17 00:00:00 2001
From: Denis P <pisarevden@gmail.com>
Date: Mon, 7 Jan 2019 23:36:30 +0100
Subject: [PATCH 21/23] revert

---
 .gitlab-ci.yml                 |  4 ++--
 scripts/gitlab/publish-snap.sh | 26 +++++---------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 775be44d7e3..b2ae453cf99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,8 +96,8 @@ publish-docker:
     - scripts/gitlab/publish-docker.sh parity
 
 publish-snap:
-  stage:                           optional # publish
-  # only:                            *releaseable_branches
+  stage:                           publish
+  only:                            *releaseable_branches
   image:                           parity/snapcraft:gitlab-ci
   variables:
     BUILD_ARCH:                  amd64
diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 1e55ca25399..03ea2d80557 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -3,26 +3,10 @@
 set -e # fail on any error
 set -u # treat unset variables as error
 
-echo CI_COMMIT_REF NAME: $CI_COMMIT_REF_NAME
-echo VERSION: $VERSION
-echo SCHEDULE_TAG-CI_COMMIT_REF_NAME: "${SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}"
-test "$SCHEDULE_TAG-${CI_COMMIT_REF_NAME}}" = "nightly" 
-echo VERSION-ID_SHORT-DATE_STR: "${VERSION}-${ID_SHORT}-${DATE_STR}"
-test VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
-test "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
-
-# case $ {track} in
-#   nightly) export VERSION_NIGHTLY=vn;;
-#   beta) export VERSION_BETA=vb;;
-#   stable) export VERSION_STABLE=vs;;
-#   *) echo "Non releasable track" exit 0;;
-# esac
-
 case ${CI_COMMIT_REF_NAME} in
   nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
   beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;
   stable|*v2.1*) export GRADE="stable" CHANNEL="stable";;
-  pr|*10142*) export GRADE="debug_grade" CHANNEL="debug_channel";; # delme
   *) echo "No release" exit 0;;
 esac
 
@@ -43,8 +27,8 @@ cat $SNAP_PACKAGE".sha256"
 echo "__________Releasing snap package__________"
 echo "Release channel :" $CHANNEL " Branch/tag: " $CI_COMMIT_REF_NAME
 
-# echo $SNAPCRAFT_LOGIN_PARITY_BASE64 | base64 --decode > snapcraft.login
-# snapcraft login --with snapcraft.login
-# snapcraft push --release $CHANNEL $SNAP_PACKAGE
-# snapcraft status parity
-# snapcraft logout
+echo $SNAPCRAFT_LOGIN_PARITY_BASE64 | base64 --decode > snapcraft.login
+snapcraft login --with snapcraft.login
+snapcraft push --release $CHANNEL $SNAP_PACKAGE
+snapcraft status parity
+snapcraft logout

From a7ca0512c93d18a7674c0f4cc2a1991a979ddba6 Mon Sep 17 00:00:00 2001
From: TriplEight <denis.pisarev@parity.io>
Date: Wed, 9 Jan 2019 12:06:05 +0100
Subject: [PATCH 22/23] Update scripts/gitlab/publish-snap.sh

Co-Authored-By: 5chdn <5chdn@users.noreply.github.com>
---
 scripts/gitlab/publish-snap.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 03ea2d80557..97004b40344 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -6,7 +6,10 @@ set -u # treat unset variables as error
 case ${CI_COMMIT_REF_NAME} in
   nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
   beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;
-  stable|*v2.1*) export GRADE="stable" CHANNEL="stable";;
+  case ${CI_COMMIT_REF_NAME} in
+  nightly) export GRADE="devel" CHANNEL="edge";;
+  beta) export GRADE="stable" CHANNEL="beta";;
+  stable) export GRADE="stable" CHANNEL="stable";;
   *) echo "No release" exit 0;;
 esac
 

From 14264fe6847b7684c6bd2e522ec341dcba12d46b Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Wed, 9 Jan 2019 12:09:58 +0100
Subject: [PATCH 23/23] ci: read track from cargo toml

---
 scripts/gitlab/publish-snap.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
index 97004b40344..a664341e890 100755
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -3,10 +3,9 @@
 set -e # fail on any error
 set -u # treat unset variables as error
 
-case ${CI_COMMIT_REF_NAME} in
-  nightly|*v2.3*) export GRADE="devel" CHANNEL="edge";;
-  beta|*v2.2*) export GRADE="stable" CHANNEL="beta";;
-  case ${CI_COMMIT_REF_NAME} in
+TRACK=`awk -F '=' '/^track/ {print $2}' ./util/version/Cargo.toml`
+
+case ${TRACK} in
   nightly) export GRADE="devel" CHANNEL="edge";;
   beta) export GRADE="stable" CHANNEL="beta";;
   stable) export GRADE="stable" CHANNEL="stable";;