diff --git a/core/Cargo.lock b/core/Cargo.lock index cc7698271..6b5c1667e 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -4924,7 +4924,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.5-rev.1" +version = "0.3.5-rev.2" dependencies = [ "aes", "async-compression", diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml index 65d01b1db..99a9d2119 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.5-rev.1" +version = "0.3.5-rev.2" license = "MIT" [lib] diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs index 4c6f157a5..6d9f65b8a 100644 --- a/core/startos/src/version/mod.rs +++ b/core/startos/src/version/mod.rs @@ -15,8 +15,9 @@ mod v0_3_4_3; mod v0_3_4_4; mod v0_3_5; mod v0_3_5_1; +mod v0_3_5_2; -pub type Current = v0_3_5_1::Version; +pub type Current = v0_3_5_2::Version; #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)] #[serde(untagged)] @@ -28,6 +29,7 @@ enum Version { V0_3_4_4(Wrapper), V0_3_5(Wrapper), V0_3_5_1(Wrapper), + V0_3_5_2(Wrapper), Other(emver::Version), } @@ -50,6 +52,7 @@ impl Version { Version::V0_3_4_4(Wrapper(x)) => x.semver(), Version::V0_3_5(Wrapper(x)) => x.semver(), Version::V0_3_5_1(Wrapper(x)) => x.semver(), + Version::V0_3_5_2(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } } @@ -176,6 +179,7 @@ pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> { Version::V0_3_4_4(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, + Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, Version::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), @@ -215,6 +219,7 @@ mod tests { Just(Version::V0_3_4_4(Wrapper(v0_3_4_4::Version::new()))), Just(Version::V0_3_5(Wrapper(v0_3_5::Version::new()))), Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::new()))), + Just(Version::V0_3_5_2(Wrapper(v0_3_5_2::Version::new()))), em_version().prop_map(Version::Other), ] } diff --git a/core/startos/src/version/v0_3_5_2.rs b/core/startos/src/version/v0_3_5_2.rs new file mode 100644 index 000000000..860a0ce56 --- /dev/null +++ b/core/startos/src/version/v0_3_5_2.rs @@ -0,0 +1,32 @@ +use async_trait::async_trait; +use emver::VersionRange; +use sqlx::PgPool; + +use super::VersionT; +use super::{v0_3_4::V0_3_0_COMPAT, v0_3_5_1}; +use crate::prelude::*; + +const V0_3_5_2: emver::Version = emver::Version::new(0, 3, 5, 2); + +#[derive(Clone, Debug)] +pub struct Version; + +#[async_trait] +impl VersionT for Version { + type Previous = v0_3_5_1::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> emver::Version { + V0_3_5_2 + } + fn compat(&self) -> &'static VersionRange { + &V0_3_0_COMPAT + } + async fn up(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> { + Ok(()) + } + async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> { + Ok(()) + } +} diff --git a/web/package.json b/web/package.json index 7784543fe..80ee91e39 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "startos-ui", - "version": "0.3.5.1", + "version": "0.3.5.2", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "scripts": { diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json index 0a678d4e8..30eb8900b 100644 --- a/web/patchdb-ui-seed.json +++ b/web/patchdb-ui-seed.json @@ -1,6 +1,6 @@ { "name": null, - "ack-welcome": "0.3.5.1", + "ack-welcome": "0.3.5.2", "marketplace": { "selected-url": "https://registry.start9.com/", "known-hosts": { 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 23bc7e1fd..292480e09 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,11 +12,11 @@

This Release

-

0.3.5.1

+

0.3.5.2

View the complete @@ -32,6 +32,19 @@

Previous 0.3.5.x Releases

+

0.3.5.1

+

+ View the complete + + release notes + + for more details. +

+

0.3.5

View the complete diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts index 17460609a..76c43c755 100644 --- a/web/projects/ui/src/app/services/api/api.fixures.ts +++ b/web/projects/ui/src/app/services/api/api.fixures.ts @@ -21,9 +21,10 @@ export module Mock { 'shutting-down': false, } export const MarketplaceEos: RR.GetMarketplaceEosRes = { - version: '0.3.5.1', + version: '0.3.5.2', headline: 'Our biggest release ever.', 'release-notes': { + '0.3.5.2': 'Some **Markdown** release _notes_ for 0.3.5.2', '0.3.5.1': 'Some **Markdown** release _notes_ for 0.3.5.1', '0.3.4.4': 'Some **Markdown** release _notes_ for 0.3.4.4', '0.3.4.3': 'Some **Markdown** release _notes_ for 0.3.4.3', diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts index 1dc7abd66..51689d49d 100644 --- a/web/projects/ui/src/app/services/api/mock-patch.ts +++ b/web/projects/ui/src/app/services/api/mock-patch.ts @@ -42,7 +42,7 @@ export const mockPatchData: DataModel = { }, 'server-info': { id: 'abcdefgh', - version: '0.3.5.1', + version: '0.3.5.2', 'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(), 'lan-address': 'https://adjective-noun.local', 'tor-address': 'https://myveryownspecialtoraddress.onion',