From d9f6aba308db4c418588219de6e2110f59ce1bdb Mon Sep 17 00:00:00 2001 From: Afri Schoedon <5chdn@users.noreply.github.com> Date: Fri, 27 Apr 2018 17:45:45 +0200 Subject: [PATCH] Stabilize 1.10.3 (#8474) * Stabelize 1.10 * Bump stable to 1.10.3 * Update Gitlab scripts * Fix snap builds (#8483) * fix docker build (#8462) * Use as Docker's ( is not used anymore) --- .gitlab-ci.yml | 2 +- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- docker/hub/Dockerfile | 2 +- mac/Parity.pkgproj | 2 +- nsis/installer.nsi | 2 +- scripts/gitlab-build.sh | 3 ++- util/version/Cargo.toml | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a04125e5..2c216496f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,7 +188,7 @@ docker-build: before_script: - docker info script: - - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi + - if [ "$CI_BUILD_REF_NAME" == "master" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi - echo "Tag:" $DOCKER_TAG - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity - scripts/docker-build.sh $DOCKER_TAG diff --git a/Cargo.lock b/Cargo.lock index 390eacd63..0677d6efa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1862,7 +1862,7 @@ dependencies = [ [[package]] name = "parity" -version = "1.10.2" +version = "1.10.3" dependencies = [ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.29.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1910,7 +1910,7 @@ dependencies = [ "parity-rpc 1.9.0", "parity-rpc-client 1.4.0", "parity-updater 1.9.0", - "parity-version 1.10.2", + "parity-version 1.10.3", "parity-whisper 0.1.0", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", @@ -1959,7 +1959,7 @@ dependencies = [ "parity-reactor 0.1.0", "parity-ui 1.9.0", "parity-ui-deprecation 1.10.0", - "parity-version 1.10.2", + "parity-version 1.10.3", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2110,7 +2110,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.10.2", + "parity-version 1.10.3", "parking_lot 0.5.4 (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.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2227,7 +2227,7 @@ dependencies = [ "ethsync 1.9.0", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "parity-hash-fetch 1.9.0", - "parity-version 1.10.2", + "parity-version 1.10.3", "parking_lot 0.5.4 (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)", @@ -2236,7 +2236,7 @@ dependencies = [ [[package]] name = "parity-version" -version = "1.10.2" +version = "1.10.3" dependencies = [ "ethcore-bytes 0.1.0", "rlp 0.2.1", diff --git a/Cargo.toml b/Cargo.toml index 1076aeb9e..ed5c710b5 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.10.2" +version = "1.10.3" license = "GPL-3.0" authors = ["Parity Technologies "] diff --git a/docker/hub/Dockerfile b/docker/hub/Dockerfile index c3406a5bd..509c46456 100644 --- a/docker/hub/Dockerfile +++ b/docker/hub/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update && \ # evmjit dependencies zlib1g-dev \ libedit-dev \ - libudev-dev &&\ + libudev-dev &&\ # cmake and llvm ppa's. then update ppa's add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \ add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" && \ diff --git a/mac/Parity.pkgproj b/mac/Parity.pkgproj index c4b7683e7..3df9c4658 100755 --- a/mac/Parity.pkgproj +++ b/mac/Parity.pkgproj @@ -462,7 +462,7 @@ OVERWRITE_PERMISSIONS VERSION - 1.10.2 + 1.10.3 UUID 2DCD5B81-7BAF-4DA1-9251-6274B089FD36 diff --git a/nsis/installer.nsi b/nsis/installer.nsi index 895327b63..e5a55c169 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 10 -!define VERSIONBUILD 2 +!define VERSIONBUILD 3 !define ARGS "" !define FIRST_START_ARGS "--mode=passive ui" diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh index a2a084adc..89fa2a085 100755 --- a/scripts/gitlab-build.sh +++ b/scripts/gitlab-build.sh @@ -309,11 +309,12 @@ case $BUILD_PLATFORM in x86_64-unknown-snap-gnu) ARC="amd64" EXT="snap" + apt update apt install -y expect zip rhash 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.10* ]]; + if [[ "$CI_BUILD_REF_NAME" = "beta" || "$VER" == *1.11* ]]; then sed -i -e 's/grade: devel/grade: stable/' snap/snapcraft.yaml; fi diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml index 1ba3aea5b..d3a0021ad 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 (via env CARGO_PKG_VERSION) -version = "1.10.2" +version = "1.10.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" +track = "stable" # Indicates a critical release in this track (i.e. consensus issue) critical = false