Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-02 05:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next/patch' of github.com:Start9Labs/start-os into next/minor

Browse Source
This commit is contained in:
Aiden McClelland
2024-04-01 14:57:10 -06:00
parent f021ad9b0a 2b88555028
commit 1c419d5c65
10 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/startos/src/version/mod.rs
View File

@@ -10,6 +10,7 @@ use crate::Error;
mod v0_3_5;
mod v0_3_5_1;
mod v0_3_5_2;
mod v0_3_6;
pub type Current = v0_3_6::Version;
@@ -20,6 +21,7 @@ enum Version {
LT0_3_5(LTWrapper<v0_3_5::Version>),
V0_3_5(Wrapper<v0_3_5::Version>),
V0_3_5_1(Wrapper<v0_3_5_1::Version>),
V0_3_5_2(Wrapper<v0_3_5_2::Version>),
V0_3_6(Wrapper<v0_3_6::Version>),
Other(emver::Version),
}
@@ -39,6 +41,7 @@ impl Version {
Version::LT0_3_5(LTWrapper(_, x)) => x.clone(),
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::V0_3_6(Wrapper(x)) => x.semver(),
Version::Other(x) => x.clone(),
}
@@ -208,6 +211,7 @@ pub async fn init(db: &PatchDb) -> Result<(), Error> {
}
Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), &db).await?,
Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), &db).await?,
Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), &db).await?,
Version::V0_3_6(v) => v.0.migrate_to(&Current::new(), &db).await?,
Version::Other(_) => {
return Err(Error::new(
@@ -242,6 +246,7 @@ mod tests {
prop_oneof![
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),
]
}