Switching to stable-track

.gitlab-ci.yml

@@ -19,7 +19,6 @@ variables:
 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
   only:                            &releaseable_branches
     - stable
-    - beta
     - tags
     - schedules
 
@@ -308,7 +307,7 @@ publish-release-awss3-nightly:     &publish-release-awss3
   script:
     - echo "__________Push binaries to AWS S3____________"
     - case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
-       (beta|stable|nightly)
+       (stable|nightly)
          export BUCKET=releases.parity.io/ethereum;
          ;;
        (*)

parity/cli/mod.rs

@@ -296,7 +296,7 @@ usage! {
 
 			ARG arg_release_track: (String) = "current", or |c: &Config| c.parity.as_ref()?.release_track.clone(),
 			"--release-track=[TRACK]",
-			"Set which release track we should use for updates. TRACK can be one of: stable - Stable releases; beta - Beta releases; nightly - Nightly releases (unstable); testing - Testing releases (do not use); current - Whatever track this executable was released on.",
+			"Set which release track we should use for updates. TRACK can be one of: stable - Stable releases; nightly - Nightly releases (unstable); testing - Testing releases (do not use); current - Whatever track this executable was released on.",
 
 			ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(),
 			"--chain=[CHAIN]",

parity/configuration.rs

@@ -981,9 +981,7 @@ impl Configuration {
 			},
 			track: match self.args.arg_release_track.as_ref() {
 				"stable" => ReleaseTrack::Stable,
-				"beta" => ReleaseTrack::Beta,
 				"nightly" => ReleaseTrack::Nightly,
-				"testing" => ReleaseTrack::Testing,
 				"current" => ReleaseTrack::Unknown,
 				_ => return Err("Invalid value for `--releases-track`. See `--help` for more information.".into()),
 			},
@@ -1512,10 +1510,8 @@ mod tests {
 	#[test]
 	fn should_parse_updater_options() {
 		// when
-		let conf0 = parse(&["parity", "--release-track=testing"]);
-		let conf1 = parse(&["parity", "--auto-update", "all", "--no-consensus", "--auto-update-delay", "300"]);
-		let conf2 = parse(&["parity", "--no-download", "--auto-update=all", "--release-track=beta", "--auto-update-delay=300", "--auto-update-check-frequency=100"]);
-		let conf3 = parse(&["parity", "--auto-update=xxx"]);
+		let conf0 = parse(&["parity", "--auto-update", "all", "--no-consensus", "--auto-update-delay", "300"]);
+		let conf1 = parse(&["parity", "--auto-update=xxx"]);
 
 		// then
 		assert_eq!(conf0.update_policy().unwrap(), UpdatePolicy {

scripts/docker/hub/publish-docker.sh

@@ -23,19 +23,6 @@ case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
             --tag "parity/parity:${SCHEDULE_TAG}" \
             --file tools/Dockerfile .;
         docker push "parity/parity:${SCHEDULE_TAG}";;
-    "beta")
-        echo "Docker TAGs - 'parity/parity:beta', 'parity/parity:latest', \
-            'parity/parity:${VERSION}-${CI_COMMIT_REF_NAME}'";
-        docker build --no-cache \
-            --build-arg VCS_REF="${CI_COMMIT_SHA}" \
-            --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')" \
-            --tag "parity/parity:beta" \
-            --tag "parity/parity:latest" \
-            --tag "parity/parity:${VERSION}-${CI_COMMIT_REF_NAME}" \
-            --file tools/Dockerfile .;
-        docker push "parity/parity:beta";
-        docker push "parity/parity:latest";
-        docker push "parity/parity:${VERSION}-${CI_COMMIT_REF_NAME}";;
     "stable")
         echo "Docker TAGs - 'parity/parity:${VERSION}-${CI_COMMIT_REF_NAME}', 'parity/parity:stable'";
         docker build --no-cache \
@@ -45,7 +32,8 @@ case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
             --tag "parity/parity:stable" \
             --file tools/Dockerfile .;
         docker push "parity/parity:${VERSION}-${CI_COMMIT_REF_NAME}";
-        docker push "parity/parity:stable";;
+        docker push "parity/parity:stable";
+        docker push "parity/parity:latest";;
     v[0-9]*.[0-9]*)
         echo "Docker TAG - 'parity/parity:${VERSION}-${TRACK}'"
         docker build --no-cache \

scripts/gitlab/publish-snap.sh

@@ -11,7 +11,6 @@ SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"
 # 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";;
   stable) export GRADE="stable" CHANNEL="stable";;
   *) echo "No release" && exit 0;;
 esac

scripts/gitlab/rust-changes.sh

@@ -7,7 +7,7 @@ echo "__________Checking if Rust files were changed__________"
 git log --graph --oneline --decorate=short -n 10
 
 case ${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}} in
-  (beta|stable)
+  (stable)
     export GIT_COMPARE=origin/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}~
     ;;
   (master|nightly)

updater/src/types/release_track.rs

@@ -24,12 +24,8 @@ use std::fmt;
 pub enum ReleaseTrack {
 	/// Stable track.
 	Stable = 1,
-	/// Beta track.
-	Beta = 2,
 	/// Nightly track.
-	Nightly = 3,
-	/// Testing track.
-	Testing = 4,
+	Nightly = 2,
 	/// No known track, also "current executable's track" when it's not yet known.
 	Unknown = 0,
 }
@@ -38,9 +34,7 @@ impl fmt::Display for ReleaseTrack {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(f, "{}", match *self {
 			ReleaseTrack::Stable => "stable",
-			ReleaseTrack::Beta => "beta",
 			ReleaseTrack::Nightly => "nightly",
-			ReleaseTrack::Testing => "testing",
 			ReleaseTrack::Unknown => "unknown",
 		})
 	}
@@ -50,9 +44,7 @@ impl<'a> From<&'a str> for ReleaseTrack {
 	fn from(s: &'a str) -> Self {
 		match s {
 			"stable" => ReleaseTrack::Stable,
-			"beta" => ReleaseTrack::Beta,
 			"nightly" => ReleaseTrack::Nightly,
-			"testing" => ReleaseTrack::Testing,
 			_ => ReleaseTrack::Unknown,
 		}
 	}
@@ -62,9 +54,7 @@ impl From<u8> for ReleaseTrack {
 	fn from(i: u8) -> Self {
 		match i {
 			1 => ReleaseTrack::Stable,
-			2 => ReleaseTrack::Beta,
-			3 => ReleaseTrack::Nightly,
-			4 => ReleaseTrack::Testing,
+			2 => ReleaseTrack::Nightly,
 			_ => ReleaseTrack::Unknown,
 		}
 	}
@@ -83,36 +73,28 @@ mod tests {
 	#[test]
 	fn test_release_track_from() {
 		assert_eq!(ReleaseTrack::Stable, 1u8.into());
-		assert_eq!(ReleaseTrack::Beta, 2u8.into());
-		assert_eq!(ReleaseTrack::Nightly, 3u8.into());
-		assert_eq!(ReleaseTrack::Testing, 4u8.into());
+		assert_eq!(ReleaseTrack::Nightly, 2u8.into());
 		assert_eq!(ReleaseTrack::Unknown, 0u8.into());
 	}
 
 	#[test]
 	fn test_release_track_into() {
 		assert_eq!(1u8, u8::from(ReleaseTrack::Stable));
-		assert_eq!(2u8, u8::from(ReleaseTrack::Beta));
-		assert_eq!(3u8, u8::from(ReleaseTrack::Nightly));
-		assert_eq!(4u8, u8::from(ReleaseTrack::Testing));
+		assert_eq!(2u8, u8::from(ReleaseTrack::Nightly));
 		assert_eq!(0u8, u8::from(ReleaseTrack::Unknown));
 	}
 
 	#[test]
 	fn test_release_track_from_str() {
 		assert_eq!(ReleaseTrack::Stable, "stable".into());
-		assert_eq!(ReleaseTrack::Beta, "beta".into());
 		assert_eq!(ReleaseTrack::Nightly, "nightly".into());
-		assert_eq!(ReleaseTrack::Testing, "testing".into());
 		assert_eq!(ReleaseTrack::Unknown, "unknown".into());
 	}
 
 	#[test]
 	fn test_release_track_into_str() {
 		assert_eq!("stable", ReleaseTrack::Stable.to_string());
-		assert_eq!("beta", ReleaseTrack::Beta.to_string());
 		assert_eq!("nightly", ReleaseTrack::Nightly.to_string());
-		assert_eq!("testing", ReleaseTrack::Testing.to_string());
 		assert_eq!("unknown", ReleaseTrack::Unknown.to_string());
 	}
 }

util/version/src/lib.rs

@@ -30,7 +30,7 @@ mod generated {
 
 #[cfg(feature = "final")]
 const THIS_TRACK: &'static str = generated::TRACK;
-// ^^^ should be reset in Cargo.toml to "stable" or "beta" according to the release branch.
+// ^^^ should be reset in Cargo.toml to "stable" according to the release branch.
 
 #[cfg(not(feature = "final"))]
 const THIS_TRACK: &'static str = "unstable";