From fdf473016bdedb9518949455731e78829c56233f Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Tue, 29 Mar 2022 12:40:41 -0600 Subject: [PATCH] bump version for 0.3.0.1 (#1353) * bump version for 0.3.0.1 * fix mock versioning * update welcome message * remove old release note Co-authored-by: Lucy Cifferello <12953208+elvece@users.noreply.github.com> --- backend/Cargo.lock | 2 +- backend/Cargo.toml | 2 +- backend/src/version/mod.rs | 5 ++- backend/src/version/v0_3_0.rs | 2 +- backend/src/version/v0_3_0_1.rs | 26 ++++++++++++ frontend/package-lock.json | 4 +- frontend/package.json | 2 +- .../modals/os-welcome/os-welcome.page.html | 40 ++++++++++--------- .../modals/os-welcome/os-welcome.page.scss | 4 ++ .../ui/src/app/services/api/mock-patch.ts | 2 +- 10 files changed, 62 insertions(+), 27 deletions(-) create mode 100644 backend/src/version/v0_3_0_1.rs diff --git a/backend/Cargo.lock b/backend/Cargo.lock index fc35e62cf..86f89459a 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -825,7 +825,7 @@ dependencies = [ [[package]] name = "embassy-os" -version = "0.3.0" +version = "0.3.0-rev.1" dependencies = [ "aes", "async-trait", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 124c1b463..748d71c7a 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.0" +version = "0.3.0-rev.1" [lib] name = "embassy" diff --git a/backend/src/version/mod.rs b/backend/src/version/mod.rs index 84923b296..07e231a3e 100644 --- a/backend/src/version/mod.rs +++ b/backend/src/version/mod.rs @@ -9,13 +9,15 @@ use rpc_toolkit::command; use crate::{Error, ResultExt}; mod v0_3_0; +mod v0_3_0_1; -pub type Current = v0_3_0::Version; +pub type Current = v0_3_0_1::Version; #[derive(serde::Serialize, serde::Deserialize)] #[serde(untagged)] enum Version { V0_3_0(Wrapper), + V0_3_0_1(Wrapper), Other(emver::Version), } @@ -111,6 +113,7 @@ pub async fn init(db: &mut Db) -> Result<(), Error> { let version: Version = db.get(&ptr).await?; match version { Version::V0_3_0(v) => v.0.migrate_to(&Current::new(), db).await?, + Version::V0_3_0_1(v) => v.0.migrate_to(&Current::new(), db).await?, Version::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), diff --git a/backend/src/version/v0_3_0.rs b/backend/src/version/v0_3_0.rs index 80b984920..e2c660cf1 100644 --- a/backend/src/version/v0_3_0.rs +++ b/backend/src/version/v0_3_0.rs @@ -5,7 +5,7 @@ use super::*; const V0_3_0: emver::Version = emver::Version::new(0, 3, 0, 0); lazy_static! { - static ref V0_3_0_COMPAT: VersionRange = VersionRange::Conj( + pub static ref V0_3_0_COMPAT: VersionRange = VersionRange::Conj( Box::new(VersionRange::Anchor( emver::GTE, emver::Version::new(0, 3, 0, 0), diff --git a/backend/src/version/v0_3_0_1.rs b/backend/src/version/v0_3_0_1.rs new file mode 100644 index 000000000..bc1aee3cd --- /dev/null +++ b/backend/src/version/v0_3_0_1.rs @@ -0,0 +1,26 @@ +use emver::VersionRange; + +use super::*; + +const V0_3_0_1: emver::Version = emver::Version::new(0, 3, 0, 1); + +pub struct Version; +#[async_trait] +impl VersionT for Version { + type Previous = v0_3_0::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> emver::Version { + V0_3_0_1 + } + fn compat(&self) -> &'static VersionRange { + &*v0_3_0::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/frontend/package-lock.json b/frontend/package-lock.json index b1725f336..7b1b95f99 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "embassy-os", - "version": "0.3.0", + "version": "0.3.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "embassy-os", - "version": "0.3.0", + "version": "0.3.0.1", "dependencies": { "@angular/animations": "^13.2.0", "@angular/common": "^13.2.0", diff --git a/frontend/package.json b/frontend/package.json index b0b2f740e..69f3c06f5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "embassy-os", - "version": "0.3.0", + "version": "0.3.0.1", "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 457c353f2..ccb4a44ad 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 @@ -10,7 +10,10 @@ -

A whole new Embassy!

+

Minor bugfixes and performance improvements.

+
Previous releases:
+
0.3.0 Release Notes
+

Check out the full Release Notes.

-

Highlights

+
Highlights
  • - SSD Support - Embassy now requires an external SSD, offering more - storage, better reliability, and a faster experience. + SSD Support - Embassy now requires an external SSD, offering more storage, + better reliability, and a faster experience.
    • -
  • Websockets - Provides a smooth, "real-time" feel.
    • +
  • Websockets - Provides a smooth, "real-time" feel.
  • - Full Embassy Backups - Create encrypted backups of your Embassy and - all its services with a single button. + Full Embassy Backups - Create encrypted backups of your Embassy and all + its services with a single button.
  • - LAN Shared Folders (for backups) - Easily perform "over-the-air" - backups on your desktop/laptop or a drive plugged into your - desktop/laptop. + LAN Shared Folders (for backups) - Easily perform "over-the-air" backups + on your desktop/laptop or a drive plugged into your desktop/laptop.
  • - Revamped User Interface - The user interface has been rewritten and + Revamped User Interface - The user interface has been rewritten and redesigned to be more performant, understandable, and beautiful.
  • - Session Management - View your Embassy's active sessions and log - out remotely. + Session Management - View your Embassy's active sessions and log out + remotely.
  • - Alt Marketplaces - Optionally connect to and browse alternative - service marketplaces. + Alt Marketplaces - Optionally connect to and browse alternative service + marketplaces.
  • - Progress Reporting - View live progress of services - installs/updates and EmbassyOS updates. + Progress Reporting - View live progress of services installs/updates and + EmbassyOS updates.
  • - Health Checks - View the health of your services at a glance, along - with helpful messages if something is wrong. + Health Checks - View the health of your services at a glance, along with + helpful messages if something is wrong.
diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss index 485a7432a..f025718bc 100644 --- a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss +++ b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss @@ -14,4 +14,8 @@ li { padding-bottom: 12px; } +} + +.note-padding { + padding-bottom: 12px; } \ No newline at end of file diff --git a/frontend/projects/ui/src/app/services/api/mock-patch.ts b/frontend/projects/ui/src/app/services/api/mock-patch.ts index 2fbff01df..396edfcba 100644 --- a/frontend/projects/ui/src/app/services/api/mock-patch.ts +++ b/frontend/projects/ui/src/app/services/api/mock-patch.ts @@ -20,7 +20,7 @@ export const mockPatchData: DataModel = { }, 'server-info': { id: 'embassy-abcdefgh', - version: '0.3.0', + version: '0.3.0.1', 'last-backup': null, 'lan-address': 'https://embassy-abcdefgh.local', 'tor-address': 'http://myveryownspecialtoraddress.onion',