diff --git a/core/Cargo.lock b/core/Cargo.lock index 69d23b92c..9c7b79c0d 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -4961,7 +4961,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.6-alpha.1" +version = "0.3.6-alpha.2" dependencies = [ "aes", "async-compression", diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml index 5e84aac5e..6969b5301 100644 --- a/core/startos/Cargo.toml +++ b/core/startos/Cargo.toml @@ -14,7 +14,7 @@ keywords = [ name = "start-os" readme = "README.md" repository = "https://github.com/Start9Labs/start-os" -version = "0.3.6-alpha.1" +version = "0.3.6-alpha.2" license = "MIT" [lib] diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs index ebd178e37..39e6eae72 100644 --- a/core/startos/src/version/mod.rs +++ b/core/startos/src/version/mod.rs @@ -15,8 +15,9 @@ mod v0_3_5_1; mod v0_3_5_2; mod v0_3_6_alpha_0; mod v0_3_6_alpha_1; +mod v0_3_6_alpha_2; -pub type Current = v0_3_6_alpha_1::Version; +pub type Current = v0_3_6_alpha_2::Version; #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)] #[serde(untagged)] @@ -28,6 +29,7 @@ enum Version { V0_3_5_2(Wrapper), V0_3_6_alpha_0(Wrapper), V0_3_6_alpha_1(Wrapper), + V0_3_6_alpha_2(Wrapper), Other(exver::Version), } @@ -49,6 +51,7 @@ impl Version { Version::V0_3_5_2(Wrapper(x)) => x.semver(), Version::V0_3_6_alpha_0(Wrapper(x)) => x.semver(), Version::V0_3_6_alpha_1(Wrapper(x)) => x.semver(), + Version::V0_3_6_alpha_2(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } } @@ -250,6 +253,7 @@ pub async fn init( Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?, Version::V0_3_6_alpha_0(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?, Version::V0_3_6_alpha_1(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?, + Version::V0_3_6_alpha_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?, Version::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), @@ -300,6 +304,9 @@ mod tests { Just(Version::V0_3_6_alpha_1(Wrapper( v0_3_6_alpha_1::Version::new() ))), + Just(Version::V0_3_6_alpha_2(Wrapper( + v0_3_6_alpha_2::Version::new() + ))), em_version().prop_map(Version::Other), ] } diff --git a/core/startos/src/version/v0_3_6_alpha_2.rs b/core/startos/src/version/v0_3_6_alpha_2.rs new file mode 100644 index 000000000..4b26a05dd --- /dev/null +++ b/core/startos/src/version/v0_3_6_alpha_2.rs @@ -0,0 +1,35 @@ +use exver::{PreReleaseSegment, VersionRange}; + +use super::v0_3_5::V0_3_0_COMPAT; +use super::{v0_3_6_alpha_1, VersionT}; +use crate::db::model::Database; +use crate::prelude::*; + +lazy_static::lazy_static! { + static ref V0_3_6_alpha_2: exver::Version = exver::Version::new( + [0, 3, 6], + [PreReleaseSegment::String("alpha".into()), 2.into()] + ); +} + +#[derive(Clone, Debug)] +pub struct Version; + +impl VersionT for Version { + type Previous = v0_3_6_alpha_1::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> exver::Version { + V0_3_6_alpha_2.clone() + } + fn compat(&self) -> &'static VersionRange { + &V0_3_0_COMPAT + } + async fn up(&self, _db: &TypedPatchDb) -> Result<(), Error> { + Ok(()) + } + async fn down(&self, _db: &TypedPatchDb) -> Result<(), Error> { + Ok(()) + } +} diff --git a/web/package.json b/web/package.json index f20272d99..4a7047041 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "startos-ui", - "version": "0.3.6-alpha.1", + "version": "0.3.6-alpha.2", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "license": "MIT", diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json index 15e020cb3..f15a8d09b 100644 --- a/web/patchdb-ui-seed.json +++ b/web/patchdb-ui-seed.json @@ -21,5 +21,5 @@ "ackInstructions": {}, "theme": "Dark", "widgets": [], - "ack-welcome": "0.3.6-alpha.1" + "ack-welcome": "0.3.6-alpha.2" } diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html index d53a0746d..258c92f83 100644 --- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html +++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html @@ -12,7 +12,7 @@

This Release

-

0.3.6-alpha.1

+

0.3.6-alpha.2

This is an ALPHA release! DO NOT use for production data!
Expect that any data you create or store on this version of the OS can be LOST FOREVER!