From 9e2b3308d4ae2758c03c2179541cff48d4505b98 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 1 Feb 2018 02:21:03 +0300
Subject: [PATCH] resolve conflicts

---
 .gitlab-ci.yml          |  2 +-
 scripts/gitlab-build.sh | 24 +++++++++++++++++++++---
 snap/snapcraft.yaml     |  1 +
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff163c7ab..ab6a4a2ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,7 +143,7 @@ linux-snap:
     - rust-stable
   artifacts:
     paths:
-    - scripts/parity_*_amd64.snap
+    - snap/parity.zip
     name: "stable-x86_64-unknown-snap-gnu_parity"
   allow_failure: true
 darwin:
diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh
index 9a145ad65..245f22729 100755
--- a/scripts/gitlab-build.sh
+++ b/scripts/gitlab-build.sh
@@ -273,13 +273,31 @@ case $BUILD_PLATFORM in
     cd snap
     ARC="amd64"
     EXT="snap"
+    rm -rf *.snap
     rm -rf *snap
     sed -i 's/git/'"$VER"'/g' snapcraft.yaml
-		sed -i -e 's/source: ./source: ../' snapcraft.yaml
+    sed -i -e 's/source: ./source: ../' snapcraft.yaml
+    if [[ "$CI_BUILD_REF_NAME" = "stable" ]];
+      then
+        sed -i -e 's/grade: devel/grade: stable/' snapcraft.yaml;
+    fi
     snapcraft
-    cp "parity_"$CI_BUILD_REF_NAME"_amd64.snap" "parity_"$VER"_amd64.snap"
+    snapcraft_login=$(expect -c "
+      spawn snapcraft login
+      expect \"Email:\"
+      send \"$SNAP_EMAIL\n\"
+      expect \"Password:\"
+      send \"$SNAP_PASS\n\"
+      expect \"\$\"
+      ")
+    echo "$snapcraft_login"
+    snapcraft push "parity_"$VER"_amd64.snap"
+    snapcraft status parity
+    snapcraft logout
     md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
-    push_binaries
+    echo "add artifacts to archive"
+    rm -rf parity.zip
+    zip -r parity.zip "parity_"$VER"_amd64.snap" "parity_"$VER"_amd64.snap.md5"
     ;;
   x86_64-pc-windows-msvc)
     set_env_win
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7be9c0bf7..336c36ad4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -15,6 +15,7 @@ apps:
     command: parity
     plugs: [network, network-bind, mount-observe, x11, unity7]
 
+
 parts:
   parity:
     source: .