Bump master to 2.2.0

.gitlab-ci.yml

@@ -256,7 +256,7 @@ publish-linux-snap-armhf:
 
 publish-docker-parity-amd64: &publish_docker
   stage:                           publish
-  only:                            *publishable_branches
+  only:                            *releaseable_branches
   cache: {}
   dependencies:
     - build-linux-ubuntu-amd64

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.1.0"
+version = "2.2.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 

scripts/gitlab/package-snap.sh

@@ -3,9 +3,9 @@
 set -e # fail on any error
 set -u # treat unset variables as error
 case ${CI_COMMIT_REF_NAME} in
-  nightly|*v2.1*) export GRADE="devel";;
-  beta|*v2.0*) export GRADE="stable";;
-  stable|*v1.11*) export GRADE="stable";;
+  nightly|*v2.2*) export GRADE="devel";;
+  beta|*v2.1*) export GRADE="stable";;
+  stable|*v2.0*) export GRADE="stable";;
   *) echo "No release" exit 0;;
 esac
 SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"

scripts/gitlab/publish-docker.sh

@@ -3,7 +3,7 @@
 set -e # fail on any error
 set -u # treat unset variables as error
 
-if [ "$CI_COMMIT_REF_NAME" == "beta" ];
+if [ "$CI_COMMIT_REF_NAME" == "master" ];
 then export DOCKER_BUILD_TAG="latest";
 else export DOCKER_BUILD_TAG=$CI_COMMIT_REF_NAME;
 fi

scripts/gitlab/publish-snap.sh

@@ -4,9 +4,9 @@ set -e # fail on any error
 set -u # treat unset variables as error
 
 case ${CI_COMMIT_REF_NAME} in
-  nightly|*v2.1*) export CHANNEL="edge";;
-  beta|*v2.0*) export CHANNEL="beta";;
-  stable|*v1.11*) export CHANNEL="stable";;
+  nightly|*v2.2*) export CHANNEL="edge";;
+  beta|*v2.1*) export CHANNEL="beta";;
+  stable|*v2.0*) export CHANNEL="stable";;
   *) echo "No release" exit 0;;
 esac
 echo "Release channel :" $CHANNEL " Branch/tag: " $CI_COMMIT_REF_NAME

scripts/gitlab/push.sh

@@ -14,9 +14,9 @@ RELEASE_TABLE="$(echo "${RELEASE_TABLE//\$VERSION/${VERSION}}")"
 #The text in the file CANGELOG.md before which the table with links is inserted. Must be present in this file necessarily
 REPLACE_TEXT="The full list of included changes:"
 case ${CI_COMMIT_REF_NAME} in
-  nightly|*v2.1*) NAME="Parity "$VERSION" nightly";;
-  beta|*v2.0*) NAME="Parity "$VERSION" beta";;
-  stable|*v1.11*) NAME="Parity "$VERSION" stable";;
+  nightly|*v2.2*) NAME="Parity "$VERSION" nightly";;
+  beta|*v2.1*) NAME="Parity "$VERSION" beta";;
+  stable|*v2.0*) NAME="Parity "$VERSION" stable";;
   *) echo "No release" exit 0;;
 esac
 cd artifacts

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.1.0"
+version = "2.2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"