chore: Update to have the new version 0.3.1.1 (#1668)

This commit is contained in:
J M
2022-07-19 10:03:14 -06:00
committed by GitHub
parent 56acb3f281
commit 0f027fefb8
8 changed files with 40 additions and 17 deletions

2
backend/Cargo.lock generated
View File

@@ -1073,7 +1073,7 @@ dependencies = [
[[package]]
name = "embassy-os"
version = "0.3.1"
version = "0.3.1-rev.1"
dependencies = [
"aes",
"async-stream",

View File

@@ -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"

View File

@@ -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"

View File

@@ -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_2::Version>),
V0_3_0_3(Wrapper<v0_3_0_3::Version>),
V0_3_1(Wrapper<v0_3_1::Version>),
V0_3_1_1(Wrapper<v0_3_1_1::Version>),
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<Db: DbHandle>(
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),
]
}

View File

@@ -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<Db: DbHandle>(&self, _db: &mut Db) -> Result<(), Error> {
Ok(())

View File

@@ -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<Db: DbHandle>(&self, _db: &mut Db) -> Result<(), Error> {
Ok(())
}
async fn down<Db: DbHandle>(&self, _db: &mut Db) -> Result<(), Error> {
Ok(())
}
}

View File

@@ -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 {

View File

@@ -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": {