diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 768192739..0c69bfa3b 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -1073,7 +1073,7 @@ dependencies = [ [[package]] name = "embassy-os" -version = "0.3.1" +version = "0.3.1-rev.1" dependencies = [ "aes", "async-stream", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index a561a96b5..836f6b1e0 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -14,7 +14,7 @@ keywords = [ name = "embassy-os" readme = "README.md" repository = "https://github.com/Start9Labs/embassy-os" -version = "0.3.1" +version = "0.3.1-rev.1" [lib] name = "embassy" diff --git a/backend/src/procedure/js_scripts.rs b/backend/src/procedure/js_scripts.rs index 72f55b346..991f05157 100644 --- a/backend/src/procedure/js_scripts.rs +++ b/backend/src/procedure/js_scripts.rs @@ -300,7 +300,7 @@ async fn js_action_var_arg() { .unwrap(); let package_id = "test-package".parse().unwrap(); let package_version: Version = "0.3.0.3".parse().unwrap(); - let name = ProcedureName::Action("fetch".parse().unwrap()); + let name = ProcedureName::Action("js-action-var-arg".parse().unwrap()); let volumes: Volumes = serde_json::from_value(serde_json::json!({ "main": { "type": "data" diff --git a/backend/src/version/mod.rs b/backend/src/version/mod.rs index bb980ac31..4a47a5928 100644 --- a/backend/src/version/mod.rs +++ b/backend/src/version/mod.rs @@ -12,8 +12,9 @@ mod v0_3_0_1; mod v0_3_0_2; mod v0_3_0_3; mod v0_3_1; +mod v0_3_1_1; -pub type Current = v0_3_1::Version; +pub type Current = v0_3_1_1::Version; #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)] #[serde(untagged)] @@ -23,6 +24,7 @@ enum Version { V0_3_0_2(Wrapper), V0_3_0_3(Wrapper), V0_3_1(Wrapper), + V0_3_1_1(Wrapper), Other(emver::Version), } @@ -43,6 +45,7 @@ impl Version { Version::V0_3_0_2(Wrapper(x)) => x.semver(), Version::V0_3_0_3(Wrapper(x)) => x.semver(), Version::V0_3_1(Wrapper(x)) => x.semver(), + Version::V0_3_1_1(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } } @@ -158,6 +161,7 @@ pub async fn init( Version::V0_3_0_2(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, Version::V0_3_0_3(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, Version::V0_3_1(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, + Version::V0_3_1_1(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, Version::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), @@ -194,6 +198,7 @@ mod tests { Just(Version::V0_3_0_2(Wrapper(v0_3_0_2::Version::new()))), Just(Version::V0_3_0_3(Wrapper(v0_3_0_3::Version::new()))), Just(Version::V0_3_1(Wrapper(v0_3_1::Version::new()))), + Just(Version::V0_3_1_1(Wrapper(v0_3_1_1::Version::new()))), em_version().prop_map(Version::Other), ] } diff --git a/backend/src/version/v0_3_1.rs b/backend/src/version/v0_3_1.rs index 1855d7d08..fdb0418cf 100644 --- a/backend/src/version/v0_3_1.rs +++ b/backend/src/version/v0_3_1.rs @@ -1,17 +1,8 @@ use emver::VersionRange; -use super::*; +use super::{v0_3_0::V0_3_0_COMPAT, *}; const V0_3_1: emver::Version = emver::Version::new(0, 3, 1, 0); -lazy_static::lazy_static! { - pub static ref V0_3_1_COMPAT: VersionRange = VersionRange::Conj( - Box::new(VersionRange::Anchor( - emver::GTE, - emver::Version::new(0, 3, 0, 0), - )), - Box::new(VersionRange::Anchor(emver::LTE, Current::new().semver())), - ); -} #[derive(Clone, Debug)] pub struct Version; @@ -25,7 +16,7 @@ impl VersionT for Version { V0_3_1 } fn compat(&self) -> &'static VersionRange { - &*V0_3_1_COMPAT + &*V0_3_0_COMPAT } async fn up(&self, _db: &mut Db) -> Result<(), Error> { Ok(()) diff --git a/backend/src/version/v0_3_1_1.rs b/backend/src/version/v0_3_1_1.rs new file mode 100644 index 000000000..01b2707b6 --- /dev/null +++ b/backend/src/version/v0_3_1_1.rs @@ -0,0 +1,27 @@ +use emver::VersionRange; + +use super::{v0_3_0::V0_3_0_COMPAT, *}; + +const V0_3_1_1: emver::Version = emver::Version::new(0, 3, 1, 1); + +#[derive(Clone, Debug)] +pub struct Version; +#[async_trait] +impl VersionT for Version { + type Previous = v0_3_0_3::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> emver::Version { + V0_3_1_1 + } + fn compat(&self) -> &'static VersionRange { + &*V0_3_0_COMPAT + } + async fn up(&self, _db: &mut Db) -> Result<(), Error> { + Ok(()) + } + async fn down(&self, _db: &mut Db) -> Result<(), Error> { + Ok(()) + } +} diff --git a/backend/test/js_action_execute/package-data/scripts/test-package/0.3.0.3/embassy.js b/backend/test/js_action_execute/package-data/scripts/test-package/0.3.0.3/embassy.js index 190b47812..6910afe9d 100644 --- a/backend/test/js_action_execute/package-data/scripts/test-package/0.3.0.3/embassy.js +++ b/backend/test/js_action_execute/package-data/scripts/test-package/0.3.0.3/embassy.js @@ -760,7 +760,7 @@ export const action = { } }, - async fetch(_effects, _input, testInput) { + async 'js-action-var-arg'(_effects, _input, testInput) { assert(testInput == 42, "Input should be passed in"); return { diff --git a/frontend/package.json b/frontend/package.json index 37b4d6885..b8033fa25 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "embassy-os", - "version": "0.3.1", + "version": "0.3.1.1", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "scripts": {