diff --git a/core/Cargo.lock b/core/Cargo.lock index 929148310..15edd45d8 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -5976,7 +5976,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "start-os" -version = "0.3.6-alpha.13" +version = "0.3.6-alpha.14" dependencies = [ "aes 0.7.5", "async-acme", diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml index 0f42d020f..ca7990840 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.13" # VERSION_BUMP +version = "0.3.6-alpha.14" # VERSION_BUMP license = "MIT" [lib] diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs index 2ff43fec2..750a5ee07 100644 --- a/core/startos/src/version/mod.rs +++ b/core/startos/src/version/mod.rs @@ -33,8 +33,9 @@ mod v0_3_6_alpha_10; mod v0_3_6_alpha_11; mod v0_3_6_alpha_12; mod v0_3_6_alpha_13; +mod v0_3_6_alpha_14; -pub type Current = v0_3_6_alpha_13::Version; // VERSION_BUMP +pub type Current = v0_3_6_alpha_14::Version; // VERSION_BUMP impl Current { #[instrument(skip(self, db))] @@ -129,7 +130,8 @@ enum Version { V0_3_6_alpha_10(Wrapper), V0_3_6_alpha_11(Wrapper), V0_3_6_alpha_12(Wrapper), - V0_3_6_alpha_13(Wrapper), // VERSION_BUMP + V0_3_6_alpha_13(Wrapper), + V0_3_6_alpha_14(Wrapper), // VERSION_BUMP Other(exver::Version), } @@ -166,7 +168,8 @@ impl Version { Self::V0_3_6_alpha_10(v) => DynVersion(Box::new(v.0)), Self::V0_3_6_alpha_11(v) => DynVersion(Box::new(v.0)), Self::V0_3_6_alpha_12(v) => DynVersion(Box::new(v.0)), - Self::V0_3_6_alpha_13(v) => DynVersion(Box::new(v.0)), // VERSION_BUMP + Self::V0_3_6_alpha_13(v) => DynVersion(Box::new(v.0)), + Self::V0_3_6_alpha_14(v) => DynVersion(Box::new(v.0)), // VERSION_BUMP Self::Other(v) => { return Err(Error::new( eyre!("unknown version {v}"), @@ -195,7 +198,8 @@ impl Version { Version::V0_3_6_alpha_10(Wrapper(x)) => x.semver(), Version::V0_3_6_alpha_11(Wrapper(x)) => x.semver(), Version::V0_3_6_alpha_12(Wrapper(x)) => x.semver(), - Version::V0_3_6_alpha_13(Wrapper(x)) => x.semver(), // VERSION_BUMP + Version::V0_3_6_alpha_13(Wrapper(x)) => x.semver(), + Version::V0_3_6_alpha_14(Wrapper(x)) => x.semver(), // VERSION_BUMP Version::Other(x) => x.clone(), } } diff --git a/core/startos/src/version/v0_3_6_alpha_14.rs b/core/startos/src/version/v0_3_6_alpha_14.rs new file mode 100644 index 000000000..219b0d6d2 --- /dev/null +++ b/core/startos/src/version/v0_3_6_alpha_14.rs @@ -0,0 +1,39 @@ +use std::collections::BTreeMap; + +use exver::{PreReleaseSegment, VersionRange}; +use imbl_value::json; + +use super::v0_3_5::V0_3_0_COMPAT; +use super::{v0_3_6_alpha_13, VersionT}; +use crate::prelude::*; + +lazy_static::lazy_static! { + static ref V0_3_6_alpha_14: exver::Version = exver::Version::new( + [0, 3, 6], + [PreReleaseSegment::String("alpha".into()), 14.into()] + ); +} + +#[derive(Clone, Copy, Debug, Default)] +pub struct Version; + +impl VersionT for Version { + type Previous = v0_3_6_alpha_13::Version; + type PreUpRes = (); + + async fn pre_up(self) -> Result { + Ok(()) + } + fn semver(self) -> exver::Version { + V0_3_6_alpha_14.clone() + } + fn compat(self) -> &'static VersionRange { + &V0_3_0_COMPAT + } + fn up(self, db: &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 2faf0f318..8c19bb05b 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "startos-ui", - "version": "0.3.6-alpha.13", + "version": "0.3.6-alpha.14", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "startos-ui", - "version": "0.3.6-alpha.13", + "version": "0.3.6-alpha.14", "license": "MIT", "dependencies": { "@angular/animations": "^14.1.0", diff --git a/web/package.json b/web/package.json index 3254fcd17..128df447b 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "startos-ui", - "version": "0.3.6-alpha.13", + "version": "0.3.6-alpha.14", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "license": "MIT",