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

0.4.0-alpha.2 (#2940)

Browse Source
This commit is contained in:
Aiden McClelland
2025-05-09 16:34:29 -06:00
committed by GitHub
parent 7750e33f82
commit e1ccc583a3
9 changed files with 70 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/startos/src/service/persistent_container.rs
View File

@@ -142,9 +142,19 @@ impl PersistentContainer {
ReadOnly,
)
.await?;
let is_compat = tokio::fs::metadata(js_mount.path().join("embassy.js"))
.await
.is_ok();
let mut volumes = BTreeMap::new();
for volume in &s9pk.as_manifest().volumes {
// TODO: remove once packages are reconverted
let added = if is_compat {
["embassy".parse().unwrap()].into_iter().collect()
} else {
BTreeSet::default()
};
for volume in s9pk.as_manifest().volumes.union(&added) {
let mountpoint = lxc_container
.rootfs_dir()
.join("media/startos/volumes")

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

@@ -41,8 +41,9 @@ mod v0_3_6_alpha_18;
mod v0_4_0_alpha_0;
mod v0_4_0_alpha_1;
mod v0_4_0_alpha_2;
pub type Current = v0_4_0_alpha_1::Version; // VERSION_BUMP
pub type Current = v0_4_0_alpha_2::Version; // VERSION_BUMP
impl Current {
#[instrument(skip(self, db))]
@@ -147,7 +148,8 @@ enum Version {
V0_3_6_alpha_17(Wrapper<v0_3_6_alpha_17::Version>),
V0_3_6_alpha_18(Wrapper<v0_3_6_alpha_18::Version>),
V0_4_0_alpha_0(Wrapper<v0_4_0_alpha_0::Version>),
V0_4_0_alpha_1(Wrapper<v0_4_0_alpha_1::Version>), // VERSION_BUMP
V0_4_0_alpha_1(Wrapper<v0_4_0_alpha_1::Version>),
V0_4_0_alpha_2(Wrapper<v0_4_0_alpha_2::Version>), // VERSION_BUMP
Other(exver::Version),
}
@@ -191,7 +193,8 @@ impl Version {
Self::V0_3_6_alpha_17(v) => DynVersion(Box::new(v.0)),
Self::V0_3_6_alpha_18(v) => DynVersion(Box::new(v.0)),
Self::V0_4_0_alpha_0(v) => DynVersion(Box::new(v.0)),
Self::V0_4_0_alpha_1(v) => DynVersion(Box::new(v.0)), // VERSION_BUMP
Self::V0_4_0_alpha_1(v) => DynVersion(Box::new(v.0)),
Self::V0_4_0_alpha_2(v) => DynVersion(Box::new(v.0)), // VERSION_BUMP
Self::Other(v) => {
return Err(Error::new(
eyre!("unknown version {v}"),
@@ -227,7 +230,8 @@ impl Version {
Version::V0_3_6_alpha_17(Wrapper(x)) => x.semver(),
Version::V0_3_6_alpha_18(Wrapper(x)) => x.semver(),
Version::V0_4_0_alpha_0(Wrapper(x)) => x.semver(),
Version::V0_4_0_alpha_1(Wrapper(x)) => x.semver(), // VERSION_BUMP
Version::V0_4_0_alpha_1(Wrapper(x)) => x.semver(),
Version::V0_4_0_alpha_2(Wrapper(x)) => x.semver(), // VERSION_BUMP
Version::Other(x) => x.clone(),
}
}

37
core/startos/src/version/v0_4_0_alpha_2.rs Normal file
View File

@@ -0,0 +1,37 @@
use exver::{PreReleaseSegment, VersionRange};
use imbl_value::json;
use super::v0_3_5::V0_3_0_COMPAT;
use super::{v0_4_0_alpha_1, VersionT};
use crate::prelude::*;
lazy_static::lazy_static! {
static ref V0_4_0_alpha_2: exver::Version = exver::Version::new(
[0, 4, 0],
[PreReleaseSegment::String("alpha".into()), 2.into()]
);
}
#[derive(Clone, Copy, Debug, Default)]
pub struct Version;
impl VersionT for Version {
type Previous = v0_4_0_alpha_1::Version;
type PreUpRes = ();
async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
Ok(())
}
fn semver(self) -> exver::Version {
V0_4_0_alpha_2.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(())
}
}