From b2e509f0552c85fefd27a553933301d21c7607ca Mon Sep 17 00:00:00 2001 From: J H <2364004+Blu-J@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:58:03 -0700 Subject: [PATCH] chore: Update version to 0.3.4" (#2184) * chore: Update version to 0.3.4" * chore: Update others to the latest code * release notes * registry not marketplace --------- Co-authored-by: Matt Hill --- backend/Cargo.lock | 2 +- backend/Cargo.toml | 2 +- backend/src/version/mod.rs | 12 ++++++------ backend/src/version/{v0_3_3_1.rs => v0_3_4.rs} | 5 +++-- frontend/package.json | 2 +- .../src/app/modals/os-welcome/os-welcome.page.html | 12 ++++++++---- 6 files changed, 20 insertions(+), 15 deletions(-) rename backend/src/version/{v0_3_3_1.rs => v0_3_4.rs} (96%) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 11cefb2cb..74b525f7d 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -1263,7 +1263,7 @@ dependencies = [ [[package]] name = "embassy-os" -version = "0.3.3-rev.1" +version = "0.3.4" dependencies = [ "aes", "async-stream", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 0a91741a9..0962bbefe 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.3-rev.1" +version = "0.3.4" [lib] name = "embassy" diff --git a/backend/src/version/mod.rs b/backend/src/version/mod.rs index 83d7d2ee1..3af28f24f 100644 --- a/backend/src/version/mod.rs +++ b/backend/src/version/mod.rs @@ -18,9 +18,9 @@ mod v0_3_1_2; mod v0_3_2; mod v0_3_2_1; mod v0_3_3; -mod v0_3_3_1; +mod v0_3_4; -pub type Current = v0_3_3_1::Version; +pub type Current = v0_3_4::Version; #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)] #[serde(untagged)] @@ -35,7 +35,7 @@ enum Version { V0_3_2(Wrapper), V0_3_2_1(Wrapper), V0_3_3(Wrapper), - V0_3_3_1(Wrapper), + V0_3_4(Wrapper), Other(emver::Version), } @@ -61,7 +61,7 @@ impl Version { Version::V0_3_2(Wrapper(x)) => x.semver(), Version::V0_3_2_1(Wrapper(x)) => x.semver(), Version::V0_3_3(Wrapper(x)) => x.semver(), - Version::V0_3_3_1(Wrapper(x)) => x.semver(), + Version::V0_3_4(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } } @@ -198,7 +198,7 @@ pub async fn init( Version::V0_3_2(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, Version::V0_3_2_1(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, Version::V0_3_3(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, - Version::V0_3_3_1(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, + Version::V0_3_4(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, Version::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), @@ -241,7 +241,7 @@ mod tests { Just(Version::V0_3_2(Wrapper(v0_3_2::Version::new()))), Just(Version::V0_3_2_1(Wrapper(v0_3_2_1::Version::new()))), Just(Version::V0_3_3(Wrapper(v0_3_3::Version::new()))), - Just(Version::V0_3_3_1(Wrapper(v0_3_3_1::Version::new()))), + Just(Version::V0_3_4(Wrapper(v0_3_4::Version::new()))), em_version().prop_map(Version::Other), ] } diff --git a/backend/src/version/v0_3_3_1.rs b/backend/src/version/v0_3_4.rs similarity index 96% rename from backend/src/version/v0_3_3_1.rs rename to backend/src/version/v0_3_4.rs index 46cf6b921..03cf3d4f8 100644 --- a/backend/src/version/v0_3_3_1.rs +++ b/backend/src/version/v0_3_4.rs @@ -5,7 +5,7 @@ use serde_json::{json, Value}; use super::v0_3_0::V0_3_0_COMPAT; use super::*; -const V0_3_3_1: emver::Version = emver::Version::new(0, 3, 3, 1); +const V0_3_4: emver::Version = emver::Version::new(0, 3, 4, 0); const COMMUNITY_URL: &str = "https://community-registry.start9.com/"; const MAIN_REGISTRY: &str = "https://registry.start9.com/"; @@ -32,7 +32,7 @@ impl VersionT for Version { Version } fn semver(&self) -> emver::Version { - V0_3_3_1 + V0_3_4 } fn compat(&self) -> &'static VersionRange { &*V0_3_0_COMPAT @@ -63,6 +63,7 @@ impl VersionT for Version { } ui["theme"] = json!("Dark".to_string()); ui["widgets"] = json!([]); + ui.save(db).await?; Ok(()) } async fn down(&self, db: &mut Db) -> Result<(), Error> { diff --git a/frontend/package.json b/frontend/package.json index cd6324f66..07bc5db53 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "embassy-os", - "version": "0.3.3.1", + "version": "0.3.4", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "scripts": { diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html index 8c0dab5a5..88e49f36e 100644 --- a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html +++ b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html @@ -11,11 +11,11 @@

This release

-

0.3.3.1

+

0.3.4

View the complete @@ -25,8 +25,12 @@

Highlights
    -
  • Various UI/UX improvements
  • -
  • Various bugfixes and optimizations
  • +
  • Security patches
  • +
  • Bug fixes
  • +
  • Breakout services to Community Registry
  • +
  • UI display improvements
  • +
  • Better logs
  • +
  • New system metrics