stable: snap: release untagged versions from branches to the candidate (#10357 ) (#10372 )

* snap: release untagged versions from branches to the candidate snap channel (#10357) * snap: add the removable-media plug (#10377) This interface allows the snap to access the directories in /media. This is needed when the storage is in a separate disk, not part of home. * exchanged old(azure) bootnodes with new(ovh) ones (#10309) * exchanged old(azure) bootnodes with new(ovh) ones * Fix indent
Stable Backports (#10353 )
2019-02-20 10:52:52 +01:00 · 2019-02-14 14:14:33 +01:00
7 changed files with 24 additions and 18 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2236,7 +2236,7 @@ version = "1.12.0"
 dependencies = [
 "jni 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "panic_hook 0.1.0",
- "parity-ethereum 2.2.10",
+ "parity-ethereum 2.2.11",
 ]

 [[package]]
@@ -2252,7 +2252,7 @@ dependencies = [

 [[package]]
 name = "parity-ethereum"
-version = "2.2.10"
+version = "2.2.11"
 dependencies = [
 "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2301,7 +2301,7 @@ dependencies = [
 "parity-rpc-client 1.4.0",
 "parity-runtime 0.1.0",
 "parity-updater 1.12.0",
- "parity-version 2.2.10",
+ "parity-version 2.2.11",
 "parity-whisper 0.1.0",
 "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2456,7 +2456,7 @@ dependencies = [
 "parity-crypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-runtime 0.1.0",
 "parity-updater 1.12.0",
- "parity-version 2.2.10",
+ "parity-version 2.2.11",
 "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "patricia-trie 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2553,7 +2553,7 @@ dependencies = [
 "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-hash-fetch 1.12.0",
 "parity-path 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-version 2.2.10",
+ "parity-version 2.2.11",
 "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2563,7 +2563,7 @@ dependencies = [

 [[package]]
 name = "parity-version"
-version = "2.2.10"
+version = "2.2.11"
 dependencies = [
 "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rlp 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.2.10"
+version = "2.2.11"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

--- a/ethcore/res/ethereum/kovan.json
+++ b/ethcore/res/ethereum/kovan.json
@@ -5015,8 +5015,8 @@
 	"nodes": [
 		"enode://56abaf065581a5985b8c5f4f88bd202526482761ba10be9bfdcd14846dd01f652ec33fde0f8c0fd1db19b59a4c04465681fcef50e11380ca88d25996191c52de@40.71.221.215:30303",
 		"enode://d07827483dc47b368eaf88454fb04b41b7452cf454e194e2bd4c14f98a3278fed5d819dbecd0d010407fc7688d941ee1e58d4f9c6354d3da3be92f55c17d7ce3@52.166.117.77:30303",
-		"enode://8fa162563a8e5a05eef3e1cd5abc5828c71344f7277bb788a395cce4a0e30baf2b34b92fe0b2dbbba2313ee40236bae2aab3c9811941b9f5a7e8e90aaa27ecba@52.165.239.18:30303",
-		"enode://7e2e7f00784f516939f94e22bdc6cf96153603ca2b5df1c7cc0f90a38e7a2f218ffb1c05b156835e8b49086d11fdd1b3e2965be16baa55204167aa9bf536a4d9@52.243.47.56:30303",
-		"enode://0518a3d35d4a7b3e8c433e7ffd2355d84a1304ceb5ef349787b556197f0c87fad09daed760635b97d52179d645d3e6d16a37d2cc0a9945c2ddf585684beb39ac@40.68.248.100:30303"
+		"enode://38e6e7fd416293ed120d567a2675fe078c0205ab0671abf16982ce969823bd1f3443d590c18b321dfae7dcbe1f6ba98ef8702f255c3c9822a188abb82c53adca@51.77.66.187:30303",
+		"enode://6f289111f7c77c68651b0f4803c3a47bcec801f9c618bb41231a1a24a6dbb9c76f2fdb63ba7a21357c41ebb7f6922c17397c1b5c8f71f7d3ef7965505d4945de@144.217.72.209:30303",
+		"enode://b6340eb94c3db1362ee517801389fe21cce6354275376b1006f8ce84f8a5cfa2b836268b3727be9db7cd3e581f356f39da39418c4ec1d63d959abc235d99cd86@145.239.7.213:30303"
 	]
 }
--- a/scripts/docker/hub/Dockerfile
+++ b/scripts/docker/hub/Dockerfile
@@ -25,7 +25,6 @@ COPY scripts/docker/hub/check_sync.sh /check_sync.sh
 # switch to user parity here
 USER parity

-VOLUME [ "/home/parity/.local/share/io.parity.ethereum" ]
 EXPOSE 5001 8080 8082 8083 8545 8546 8180 30303/tcp 30303/udp

 ENTRYPOINT ["/bin/parity"]
--- a/scripts/gitlab/publish-snap.sh
+++ b/scripts/gitlab/publish-snap.sh
@@ -4,11 +4,12 @@ set -e # fail on any error
 set -u # treat unset variables as error

 # some necromancy:
-# gsub(/"/, "", $2) deletes "qoutes" 
+# gsub(/"/, "", $2) deletes "qoutes"
 # gsub(/ /, "", $2) deletes whitespaces
 TRACK=`awk -F '=' '/^track/ {gsub(/"/, "", $2); gsub(/ /, "", $2); print $2}' ./util/version/Cargo.toml`
 echo Track is: $TRACK

+# Choose snap release channel based on parity ethereum version track
 case ${TRACK} in
  nightly) export GRADE="devel" CHANNEL="edge";;
  beta) export GRADE="stable" CHANNEL="beta";;
@@ -16,6 +17,12 @@ case ${TRACK} in
  *) echo "No release" && exit 0;;
 esac

+# Release untagged versions from branches to the candidate snap channel
+case ${CI_COMMIT_REF_NAME} in
+  beta|stable) export GRADE="stable" CHANNEL="candidate";;
+esac
+
+VERSION="v"$VERSION
 SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"

 echo "__________Create snap package__________"
--- a/scripts/snap/snapcraft.template.yaml
+++ b/scripts/snap/snapcraft.template.yaml
@@ -14,20 +14,20 @@ description:        |
 apps:
  parity:
    command:        parity
-    plugs:          [home, network, network-bind, mount-observe, x11, unity7, desktop, desktop-legacy, wayland]
+    plugs:          [home, network, network-bind, mount-observe, removable-media, x11, unity7, desktop, desktop-legacy, wayland]
    desktop:        ./usr/share/applications/parity.desktop
  parity-evm:
    command:        parity-evm
-    plugs:          [home, network, network-bind]
+    plugs:          [home, network, network-bind, removable-media]
  ethkey:
    command:        ethkey
-    plugs:          [home]
+    plugs:          [home, removable-media]
  ethstore:
    command:        ethstore
-    plugs:          [home]
+    plugs:          [home, removable-media]
  whisper:
    command:        whisper
-    plugs:          [home, network-bind]
+    plugs:          [home, network-bind, removable-media]

 icon:               ./scripts/snap/icon.png

--- a/util/version/Cargo.toml
+++ b/util/version/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for Parity Ethereum version string (via env CARGO_PKG_VERSION)
-version = "2.2.10"
+version = "2.2.11"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"