Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Add in the sub repos

Browse Source
This commit is contained in:
BluJ
2023-06-30 14:47:56 -06:00
committed by Aiden McClelland
parent 712fde46eb
commit 29b0850a94
7 changed files with 88 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
backend/src/version/mod.rs
View File

@@ -247,22 +247,18 @@ mod tests {
fn versions() -> impl Strategy<Value = Version> {
prop_oneof![
<<<<<<< HEAD
Just(Version::V0_3_4_3(Wrapper(v0_3_4_3::Version::new()))),
=======
em_version().prop_map(|v| if v < v0_3_4_1::Version::new().semver() {
Version::LT0_3_4_1(LTWrapper(v0_3_4_1::Version::new(), v))
} else {
Version::LT0_3_4_1(LTWrapper(
v0_3_4_1::Version::new(),
emver::Version::new(0, 3, 0, 0),
))
}),
Just(Version::V0_3_4_1(Wrapper(v0_3_4_1::Version::new()))),
Just(Version::V0_3_4_2(Wrapper(v0_3_4_2::Version::new()))),
>>>>>>> e83250f1 (integration/refactors)
em_version().prop_map(Version::Other),
]
em_version().prop_map(|v| if v < v0_3_4_3::Version::new().semver() {
Version::LT0_3_4_3(LTWrapper(v0_3_4_3::Version::new(), v))
} else {
Version::LT0_3_4_3(LTWrapper(
v0_3_4_3::Version::new(),
emver::Version::new(0, 3, 0, 0),
))
}),
Just(Version::V0_3_4_3(Wrapper(v0_3_4_3::Version::new()))),
Just(Version::V0_4_0(Wrapper(v0_4_0::Version::new()))),
em_version().prop_map(Version::Other),
]
}
proptest! {

9
backend/src/version/v0_3_4_3.rs
View File

@@ -1,5 +1,6 @@
use async_trait::async_trait;
use emver::VersionRange;
use lazy_static::lazy_static;
use super::*;
@@ -19,7 +20,7 @@ pub struct Version;
#[async_trait]
impl VersionT for Version {
type Previous = v0_3_4_2::Version;
type Previous = Self;
fn new() -> Self {
Version
}
@@ -30,12 +31,6 @@ impl VersionT for Version {
&*V0_3_0_COMPAT
}
async fn up<Db: DbHandle>(&self, db: &mut Db, _secrets: &PgPool) -> Result<(), Error> {
crate::db::DatabaseModel::new()
.server_info()
.get_mut(db)
.await?
.save(db)
.await?;
Ok(())
}
async fn down<Db: DbHandle>(&self, _db: &mut Db, _secrets: &PgPool) -> Result<(), Error> {

2
backend/src/version/v0_4_0.rs
View File

@@ -17,7 +17,7 @@ pub struct Version;
#[async_trait]
impl VersionT for Version {
type Previous = v0_3_4::Version;
type Previous = v0_3_4_3::Version;
fn new() -> Self {
Version
}