From 94defd7f82174ae65de525a5e9b80a518a7e4529 Mon Sep 17 00:00:00 2001 From: Rando <5chdn@users.noreply.github.com> Date: Thu, 1 Mar 2018 19:36:26 +0100 Subject: [PATCH] Make 1.9 stable (#8023) * Make 1.9 stable * Bump stable to 1.9.5 * Fix gitlab builds --- Cargo.lock | 48 ++++++++++++++++++++--------------------- Cargo.toml | 2 +- mac/Parity.pkgproj | 2 +- nsis/installer.nsi | 2 +- scripts/gitlab-build.sh | 2 +- util/Cargo.toml | 2 +- util/version/Cargo.toml | 4 ++-- util/version/src/lib.rs | 2 +- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b7236faf..49447f139 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -267,7 +267,7 @@ dependencies = [ "bloomable 0.1.0", "ethcore-bigint 0.2.1", "ethcore-bytes 0.1.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "ethjson 0.1.0", "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.1.0", @@ -483,7 +483,7 @@ dependencies = [ "ethcore-io 1.9.0", "ethcore-logger 1.9.0", "ethcore-stratum 1.9.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "ethjson 0.1.0", "ethkey 0.3.0", "ethstore 0.2.0", @@ -598,7 +598,7 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-io 1.9.0", "ethcore-network 1.9.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -684,7 +684,7 @@ dependencies = [ "ethcore-bigint 0.2.1", "ethcore-bytes 0.1.0", "ethcore-logger 1.9.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "ethcrypto 0.1.0", "ethkey 0.3.0", "ethsync 1.9.0", @@ -730,7 +730,7 @@ dependencies = [ [[package]] name = "ethcore-util" -version = "1.9.4" +version = "1.9.5" dependencies = [ "ethcore-bigint 0.2.1", "ethcore-bytes 0.1.0", @@ -848,7 +848,7 @@ dependencies = [ "ethcore-io 1.9.0", "ethcore-light 1.9.0", "ethcore-network 1.9.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "ethkey 0.3.0", "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -872,7 +872,7 @@ version = "0.1.0" dependencies = [ "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.2.1", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "evmjit 1.9.0", "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.1.0", @@ -892,7 +892,7 @@ dependencies = [ "ethcore 1.9.0", "ethcore-bigint 0.2.1", "ethcore-bytes 0.1.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "ethjson 0.1.0", "evm 0.1.0", "panic_hook 0.1.0", @@ -1713,7 +1713,7 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-io 1.9.0", "ethcore-network 1.9.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-memorydb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1907,7 +1907,7 @@ dependencies = [ [[package]] name = "parity" -version = "1.9.4" +version = "1.9.5" dependencies = [ "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1927,7 +1927,7 @@ dependencies = [ "ethcore-network 1.9.0", "ethcore-secretstore 1.0.0", "ethcore-stratum 1.9.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "ethkey 0.3.0", "ethsync 1.9.0", "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1955,7 +1955,7 @@ dependencies = [ "parity-rpc 1.9.0", "parity-rpc-client 1.4.0", "parity-updater 1.9.0", - "parity-version 1.9.4", + "parity-version 1.9.5", "parity-whisper 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", @@ -1987,7 +1987,7 @@ dependencies = [ "ethcore-bigint 0.2.1", "ethcore-bytes 0.1.0", "ethcore-devtools 1.9.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "fetch 0.1.0", "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2003,7 +2003,7 @@ dependencies = [ "parity-hash-fetch 1.9.0", "parity-reactor 0.1.0", "parity-ui 1.9.0", - "parity-version 1.9.4", + "parity-version 1.9.5", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2049,7 +2049,7 @@ dependencies = [ "ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.2.1", "ethcore-bytes 0.1.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "fetch 0.1.0", "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.1.0", @@ -2099,7 +2099,7 @@ name = "parity-machine" version = "0.1.0" dependencies = [ "ethcore-bigint 0.2.1", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", ] [[package]] @@ -2125,7 +2125,7 @@ dependencies = [ "ethcore-light 1.9.0", "ethcore-logger 1.9.0", "ethcore-network 1.9.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "ethcrypto 0.1.0", "ethjson 0.1.0", "ethkey 0.3.0", @@ -2151,7 +2151,7 @@ dependencies = [ "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-reactor 0.1.0", "parity-updater 1.9.0", - "parity-version 1.9.4", + "parity-version 1.9.5", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2253,13 +2253,13 @@ dependencies = [ "ethcore 1.9.0", "ethcore-bigint 0.2.1", "ethcore-bytes 0.1.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "ethsync 1.9.0", "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-hash-fetch 1.9.0", "parity-reactor 0.1.0", - "parity-version 1.9.4", + "parity-version 1.9.5", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2268,7 +2268,7 @@ dependencies = [ [[package]] name = "parity-version" -version = "1.9.4" +version = "1.9.5" dependencies = [ "ethcore-bytes 0.1.0", "rlp 0.2.1", @@ -2733,7 +2733,7 @@ name = "rpc-cli" version = "1.4.0" dependencies = [ "bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "parity-rpc 1.9.0", "parity-rpc-client 1.4.0", @@ -3459,7 +3459,7 @@ dependencies = [ "common-types 0.1.0", "ethcore-bigint 0.2.1", "ethcore-bytes 0.1.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "ethjson 0.1.0", "keccak-hash 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3479,7 +3479,7 @@ dependencies = [ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.2.1", "ethcore-logger 1.9.0", - "ethcore-util 1.9.4", + "ethcore-util 1.9.5", "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-wasm 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 6520ed96c..3921dfb43 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Parity Ethereum client" name = "parity" -version = "1.9.4" +version = "1.9.5" license = "GPL-3.0" authors = ["Parity Technologies "] build = "build.rs" diff --git a/mac/Parity.pkgproj b/mac/Parity.pkgproj index 44ed53842..a2d7cad0f 100755 --- a/mac/Parity.pkgproj +++ b/mac/Parity.pkgproj @@ -462,7 +462,7 @@ OVERWRITE_PERMISSIONS VERSION - 1.9.4 + 1.9.5 UUID 2DCD5B81-7BAF-4DA1-9251-6274B089FD36 diff --git a/nsis/installer.nsi b/nsis/installer.nsi index 1faffdab2..94c7eab26 100644 --- a/nsis/installer.nsi +++ b/nsis/installer.nsi @@ -10,7 +10,7 @@ !define DESCRIPTION "Fast, light, robust Ethereum implementation" !define VERSIONMAJOR 1 !define VERSIONMINOR 9 -!define VERSIONBUILD 4 +!define VERSIONBUILD 5 !define ARGS "" !define FIRST_START_ARGS "--mode=passive ui" diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh index 69e91569a..1df0db11d 100755 --- a/scripts/gitlab-build.sh +++ b/scripts/gitlab-build.sh @@ -307,7 +307,7 @@ case $BUILD_PLATFORM in snapcraft clean echo "Prepare snapcraft.yaml for build on Gitlab CI in Docker image" sed -i 's/git/'"$VER"'/g' snap/snapcraft.yaml - if [[ "$CI_BUILD_REF_NAME" = "beta" || "$VER" == *1.9* ]]; + if [[ "$CI_BUILD_REF_NAME" = "stable" || "$VER" == *1.9* ]]; then sed -i -e 's/grade: devel/grade: stable/' snap/snapcraft.yaml; fi diff --git a/util/Cargo.toml b/util/Cargo.toml index d9457cefe..2850d4807 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -3,7 +3,7 @@ description = "Ethcore utility library" homepage = "http://parity.io" license = "GPL-3.0" name = "ethcore-util" -version = "1.9.4" +version = "1.9.5" authors = ["Parity Technologies "] [dependencies] diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml index 3d8ce22f6..0b0fefc25 100644 --- a/util/version/Cargo.toml +++ b/util/version/Cargo.toml @@ -3,14 +3,14 @@ [package] name = "parity-version" # NOTE: this value is used for Parity version string. -version = "1.9.4" +version = "1.9.5" authors = ["Parity Technologies "] build = "build.rs" [package.metadata] # This versions track. Should be changed to `stable` or `beta` when on respective branches. # Used by auto-updater and for Parity version string. -track = "beta" +track = "stable" # Indicates a critical release in this track (i.e. consensus issue) critical = false diff --git a/util/version/src/lib.rs b/util/version/src/lib.rs index 1862465ea..87a455613 100644 --- a/util/version/src/lib.rs +++ b/util/version/src/lib.rs @@ -28,7 +28,7 @@ include!(concat!(env!("OUT_DIR"), "/version.rs")); include!(concat!(env!("OUT_DIR"), "/rustc_version.rs")); #[cfg(feature = "final")] -const THIS_TRACK: &'static str = "beta"; +const THIS_TRACK: &'static str = "stable"; // ^^^ should be reset to "stable" or "beta" according to the release branch. #[cfg(not(feature = "final"))]