From 5fe173368bbcaf06c4fc3491e8ae203c2a201c7b Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Wed, 27 Nov 2024 11:00:48 -0700 Subject: [PATCH] v0.3.6-alpha.9 --- core/Cargo.lock | 2 +- core/startos/Cargo.toml | 2 +- core/startos/src/version/mod.rs | 6 +++- core/startos/src/version/v0_3_6_alpha_9.rs | 36 +++++++++++++++++++ web/package-lock.json | 4 +-- web/package.json | 2 +- web/patchdb-ui-seed.json | 2 +- .../modals/os-welcome/os-welcome.page.html | 2 +- 8 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 core/startos/src/version/v0_3_6_alpha_9.rs diff --git a/core/Cargo.lock b/core/Cargo.lock index 498e5903e..cdafe81a1 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -5371,7 +5371,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "start-os" -version = "0.3.6-alpha.8" +version = "0.3.6-alpha.9" dependencies = [ "aes", "async-acme", diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml index e2a20a0a1..cba5bc6dc 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.8" +version = "0.3.6-alpha.9" license = "MIT" [lib] diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs index f71cec8b3..94b61176b 100644 --- a/core/startos/src/version/mod.rs +++ b/core/startos/src/version/mod.rs @@ -27,8 +27,9 @@ mod v0_3_6_alpha_5; mod v0_3_6_alpha_6; mod v0_3_6_alpha_7; mod v0_3_6_alpha_8; +mod v0_3_6_alpha_9; -pub type Current = v0_3_6_alpha_8::Version; // VERSION_BUMP +pub type Current = v0_3_6_alpha_9::Version; // VERSION_BUMP impl Current { #[instrument(skip(self, db))] @@ -106,6 +107,7 @@ enum Version { V0_3_6_alpha_6(Wrapper), V0_3_6_alpha_7(Wrapper), V0_3_6_alpha_8(Wrapper), + V0_3_6_alpha_9(Wrapper), Other(exver::Version), } @@ -138,6 +140,7 @@ impl Version { Self::V0_3_6_alpha_6(v) => DynVersion(Box::new(v.0)), Self::V0_3_6_alpha_7(v) => DynVersion(Box::new(v.0)), Self::V0_3_6_alpha_8(v) => DynVersion(Box::new(v.0)), + Self::V0_3_6_alpha_9(v) => DynVersion(Box::new(v.0)), Self::Other(v) => { return Err(Error::new( eyre!("unknown version {v}"), @@ -162,6 +165,7 @@ impl Version { Version::V0_3_6_alpha_6(Wrapper(x)) => x.semver(), Version::V0_3_6_alpha_7(Wrapper(x)) => x.semver(), Version::V0_3_6_alpha_8(Wrapper(x)) => x.semver(), + Version::V0_3_6_alpha_9(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } } diff --git a/core/startos/src/version/v0_3_6_alpha_9.rs b/core/startos/src/version/v0_3_6_alpha_9.rs new file mode 100644 index 000000000..e01ad298e --- /dev/null +++ b/core/startos/src/version/v0_3_6_alpha_9.rs @@ -0,0 +1,36 @@ +use exver::{PreReleaseSegment, VersionRange}; + +use super::v0_3_5::V0_3_0_COMPAT; +use super::{v0_3_6_alpha_8, VersionT}; +use crate::prelude::*; + +lazy_static::lazy_static! { + static ref V0_3_6_alpha_9: exver::Version = exver::Version::new( + [0, 3, 6], + [PreReleaseSegment::String("alpha".into()), 9.into()] + ); +} + +#[derive(Clone, Copy, Debug, Default)] +pub struct Version; + +impl VersionT for Version { + type Previous = v0_3_6_alpha_8::Version; + type PreUpRes = (); + + async fn pre_up(self) -> Result { + Ok(()) + } + fn semver(self) -> exver::Version { + V0_3_6_alpha_9.clone() + } + fn compat(self) -> &'static VersionRange { + &V0_3_0_COMPAT + } + fn up(self, _: &mut Value, _: Self::PreUpRes) -> Result<(), Error> { + Ok(()) + } + fn down(self, _db: &mut Value) -> Result<(), Error> { + Ok(()) + } +} diff --git a/web/package-lock.json b/web/package-lock.json index 764694127..a36b7511e 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "startos-ui", - "version": "0.3.6-alpha.8", + "version": "0.3.6-alpha.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "startos-ui", - "version": "0.3.6-alpha.8", + "version": "0.3.6-alpha.9", "license": "MIT", "dependencies": { "@angular/animations": "^14.1.0", diff --git a/web/package.json b/web/package.json index e8aafc8c7..3f3709e11 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "startos-ui", - "version": "0.3.6-alpha.8", + "version": "0.3.6-alpha.9", "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 c6b967e29..bf6ad5b13 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.8" + "ack-welcome": "0.3.6-alpha.9" } 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 0b06c4a90..60b8162f6 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.8

+

0.3.6-alpha.9

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