From 26b6759606ec16ff0e66d3b8e4ed629e52cc50b6 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Fri, 8 Jun 2018 14:54:23 +0100 Subject: [PATCH 1/3] Cherry-pick network-specific release flag (#8821) --- util/version/Cargo.toml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml index 1c8e7fe5855..9870cddf4a2 100644 --- a/util/version/Cargo.toml +++ b/util/version/Cargo.toml @@ -12,14 +12,13 @@ build = "build.rs" # Used by auto-updater and for Parity version string. track = "beta" -# Indicates a critical release in this track (i.e. consensus issue) -critical = true - -# Latest supported fork blocks for various networks. Used ONLY by auto-updater. -[package.metadata.forks] -foundation = 4370000 -ropsten = 10 -kovan = 6600000 +# Network specific settings, used ONLY by auto-updater. +# Latest supported fork blocks. +# Indicates a critical release in this track (i.e. consensus issue). +[package.metadata.networks] +foundation = { forkBlock = 4370000, critical = false } +ropsten = { forkBlock = 10, critical = false } +kovan = { forkBlock = 6600000, critical = false } [dependencies] ethcore-bytes = { path = "../bytes" } From 713be7bd7d483c70be882ae94bbe6ed3e9df2894 Mon Sep 17 00:00:00 2001 From: 5chdn <5chdn@users.noreply.github.com> Date: Mon, 11 Jun 2018 09:55:13 +0200 Subject: [PATCH 2/3] parity-version: bump beta to 1.11.4 --- Cargo.lock | 12 +++++----- Cargo.toml | 2 +- mac/Parity.pkgproj | 2 +- nsis/installer.nsi | 2 +- util/version/Cargo.toml | 2 +- util/version/Cargo.toml.orig | 45 ++++++++++++++++++++++++++++++++++++ 6 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 util/version/Cargo.toml.orig diff --git a/Cargo.lock b/Cargo.lock index 155901cd834..9d192b91605 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1956,7 +1956,7 @@ dependencies = [ [[package]] name = "parity" -version = "1.11.3" +version = "1.11.4" dependencies = [ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2007,7 +2007,7 @@ dependencies = [ "parity-rpc 1.11.0", "parity-rpc-client 1.4.0", "parity-updater 1.11.0", - "parity-version 1.11.3", + "parity-version 1.11.4", "parity-whisper 0.1.0", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", @@ -2055,7 +2055,7 @@ dependencies = [ "parity-reactor 0.1.0", "parity-ui 1.11.0", "parity-ui-deprecation 1.10.0", - "parity-version 1.11.3", + "parity-version 1.11.4", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "registrar 0.0.1", @@ -2211,7 +2211,7 @@ dependencies = [ "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-reactor 0.1.0", "parity-updater 1.11.0", - "parity-version 1.11.3", + "parity-version 1.11.4", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "patricia-trie 0.1.0", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2332,7 +2332,7 @@ dependencies = [ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "parity-hash-fetch 1.11.0", - "parity-version 1.11.3", + "parity-version 1.11.4", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "parity-version" -version = "1.11.3" +version = "1.11.4" dependencies = [ "ethcore-bytes 0.1.0", "rlp 0.2.1", diff --git a/Cargo.toml b/Cargo.toml index 4bf628ea358..059a8194746 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ description = "Parity Ethereum client" name = "parity" # NOTE Make sure to update util/version/Cargo.toml as well -version = "1.11.3" +version = "1.11.4" license = "GPL-3.0" authors = ["Parity Technologies "] diff --git a/mac/Parity.pkgproj b/mac/Parity.pkgproj index b7f821af028..48b1024777c 100755 --- a/mac/Parity.pkgproj +++ b/mac/Parity.pkgproj @@ -462,7 +462,7 @@ OVERWRITE_PERMISSIONS VERSION - 1.11.3 + 1.11.4 UUID 2DCD5B81-7BAF-4DA1-9251-6274B089FD36 diff --git a/nsis/installer.nsi b/nsis/installer.nsi index de972d5faf6..efc649d865f 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 11 -!define VERSIONBUILD 3 +!define VERSIONBUILD 4 !define ARGS "" !define FIRST_START_ARGS "--mode=passive ui" diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml index 9870cddf4a2..b63109d7bab 100644 --- 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 version string (via env CARGO_PKG_VERSION) -version = "1.11.3" +version = "1.11.4" authors = ["Parity Technologies "] build = "build.rs" diff --git a/util/version/Cargo.toml.orig b/util/version/Cargo.toml.orig new file mode 100644 index 00000000000..f853c790c2f --- /dev/null +++ b/util/version/Cargo.toml.orig @@ -0,0 +1,45 @@ +# NOTE This file is used by the auto-updater service. +# Make sure to update the service if it's moved or the structure is changed. +[package] +name = "parity-version" +# NOTE: this value is used for Parity version string (via env CARGO_PKG_VERSION) +version = "1.11.3" +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" + +<<<<<<< HEAD +# Indicates a critical release in this track (i.e. consensus issue) +critical = true + +# Latest supported fork blocks for various networks. Used ONLY by auto-updater. +[package.metadata.forks] +foundation = 4370000 +ropsten = 10 +kovan = 6600000 +======= +# Network specific settings, used ONLY by auto-updater. +# Latest supported fork blocks. +# Indicates a critical release in this track (i.e. consensus issue). +[package.metadata.networks] +foundation = { forkBlock = 4370000, critical = false } +ropsten = { forkBlock = 10, critical = false } +kovan = { forkBlock = 6600000, critical = false } +>>>>>>> 13efb6586... Specify critical release flag per network (#8821) + +[dependencies] +ethcore-bytes = { path = "../bytes" } +rlp = { path = "../rlp" } +target_info = "0.1" + +[build-dependencies] +vergen = "0.1" +rustc_version = "0.2" +toml = "0.4" + +[features] +final = [] From 141e90e0a3cd3ec97fd8087eea7c06df4c04a235 Mon Sep 17 00:00:00 2001 From: 5chdn <5chdn@users.noreply.github.com> Date: Mon, 11 Jun 2018 13:36:04 +0200 Subject: [PATCH 3/3] parity-version: remove merge leftovers --- util/version/Cargo.toml.orig | 45 ------------------------------------ 1 file changed, 45 deletions(-) delete mode 100644 util/version/Cargo.toml.orig diff --git a/util/version/Cargo.toml.orig b/util/version/Cargo.toml.orig deleted file mode 100644 index f853c790c2f..00000000000 --- a/util/version/Cargo.toml.orig +++ /dev/null @@ -1,45 +0,0 @@ -# NOTE This file is used by the auto-updater service. -# Make sure to update the service if it's moved or the structure is changed. -[package] -name = "parity-version" -# NOTE: this value is used for Parity version string (via env CARGO_PKG_VERSION) -version = "1.11.3" -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" - -<<<<<<< HEAD -# Indicates a critical release in this track (i.e. consensus issue) -critical = true - -# Latest supported fork blocks for various networks. Used ONLY by auto-updater. -[package.metadata.forks] -foundation = 4370000 -ropsten = 10 -kovan = 6600000 -======= -# Network specific settings, used ONLY by auto-updater. -# Latest supported fork blocks. -# Indicates a critical release in this track (i.e. consensus issue). -[package.metadata.networks] -foundation = { forkBlock = 4370000, critical = false } -ropsten = { forkBlock = 10, critical = false } -kovan = { forkBlock = 6600000, critical = false } ->>>>>>> 13efb6586... Specify critical release flag per network (#8821) - -[dependencies] -ethcore-bytes = { path = "../bytes" } -rlp = { path = "../rlp" } -target_info = "0.1" - -[build-dependencies] -vergen = "0.1" -rustc_version = "0.2" -toml = "0.4" - -[features] -final = []