diff --git a/backend/Cargo.lock b/backend/Cargo.lock index d8bd94c80..9c80a7667 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -1120,7 +1120,7 @@ dependencies = [ [[package]] name = "embassy-os" -version = "0.3.2" +version = "0.3.2-rev.1" dependencies = [ "aes", "async-stream", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index d0870ce52..2fb86e719 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.2" +version = "0.3.2-rev.1" [lib] name = "embassy" diff --git a/backend/src/version/mod.rs b/backend/src/version/mod.rs index 7c754aa0b..345fe12d2 100644 --- a/backend/src/version/mod.rs +++ b/backend/src/version/mod.rs @@ -16,8 +16,9 @@ mod v0_3_1; mod v0_3_1_1; mod v0_3_1_2; mod v0_3_2; +mod v0_3_2_1; -pub type Current = v0_3_2::Version; +pub type Current = v0_3_2_1::Version; #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)] #[serde(untagged)] @@ -30,6 +31,7 @@ enum Version { V0_3_1_1(Wrapper), V0_3_1_2(Wrapper), V0_3_2(Wrapper), + V0_3_2_1(Wrapper), Other(emver::Version), } @@ -53,6 +55,7 @@ impl Version { Version::V0_3_1_1(Wrapper(x)) => x.semver(), Version::V0_3_1_2(Wrapper(x)) => x.semver(), Version::V0_3_2(Wrapper(x)) => x.semver(), + Version::V0_3_2_1(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } } @@ -187,6 +190,7 @@ pub async fn init( Version::V0_3_1_1(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, Version::V0_3_1_2(v) => v.0.migrate_to(&Current::new(), db, receipts).await?, 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::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), @@ -227,6 +231,7 @@ mod tests { Just(Version::V0_3_1_1(Wrapper(v0_3_1_1::Version::new()))), Just(Version::V0_3_1_2(Wrapper(v0_3_1_2::Version::new()))), Just(Version::V0_3_2(Wrapper(v0_3_2::Version::new()))), + Just(Version::V0_3_2_1(Wrapper(v0_3_2_1::Version::new()))), em_version().prop_map(Version::Other), ] } diff --git a/backend/src/version/v0_3_2.rs b/backend/src/version/v0_3_2.rs index 8487691f9..74d273fec 100644 --- a/backend/src/version/v0_3_2.rs +++ b/backend/src/version/v0_3_2.rs @@ -1,8 +1,6 @@ use emver::VersionRange; -use crate::config::util::MergeWith; use crate::hostname::{generate_id, get_hostname, sync_hostname}; -use crate::ErrorKind; use super::v0_3_0::V0_3_0_COMPAT; use super::*; diff --git a/backend/src/version/v0_3_2_1.rs b/backend/src/version/v0_3_2_1.rs new file mode 100644 index 000000000..36e15a43e --- /dev/null +++ b/backend/src/version/v0_3_2_1.rs @@ -0,0 +1,26 @@ +use super::v0_3_0::V0_3_0_COMPAT; +use super::*; + +const V0_3_2_1: emver::Version = emver::Version::new(0, 3, 2, 1); + +#[derive(Clone, Debug)] +pub struct Version; +#[async_trait] +impl VersionT for Version { + type Previous = v0_3_2::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> emver::Version { + V0_3_2_1 + } + fn compat(&self) -> &'static emver::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/frontend/package.json b/frontend/package.json index 468a522e4..7742b4a23 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "embassy-os", - "version": "0.3.2", + "version": "0.3.2.1", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "scripts": { diff --git a/frontend/patchdb-ui-seed.json b/frontend/patchdb-ui-seed.json index 8d9a52ff3..68d5e0831 100644 --- a/frontend/patchdb-ui-seed.json +++ b/frontend/patchdb-ui-seed.json @@ -2,7 +2,7 @@ "name": null, "auto-check-updates": true, "pkg-order": [], - "ack-welcome": "0.3.2", + "ack-welcome": "0.3.2.1", "marketplace": { "selected-id": null, "known-hosts": {} 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 563153fcf..66c4af937 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,6 +11,24 @@

This release

+

0.3.2~1

+

+ View the complete + release notes + for more details. +

+
Highlights
+
    +
  • Bugfix for LAN URLs
    • +
+ +
+

Previous releases in this series

0.3.2

View the complete diff --git a/frontend/projects/ui/src/app/services/api/api.fixures.ts b/frontend/projects/ui/src/app/services/api/api.fixures.ts index f964da7ac..b45810a36 100644 --- a/frontend/projects/ui/src/app/services/api/api.fixures.ts +++ b/frontend/projects/ui/src/app/services/api/api.fixures.ts @@ -20,9 +20,10 @@ export module Mock { updated: true, } export const MarketplaceEos: RR.GetMarketplaceEOSRes = { - version: '0.3.2', + version: '0.3.2.1', headline: 'Our biggest release ever.', 'release-notes': { + '0.3.2.1': 'Some **Markdown** release _notes_ for 0.3.2.1', '0.3.2': 'Some **Markdown** release _notes_ for 0.3.2', '0.3.1': 'Some **Markdown** release _notes_ for 0.3.1', '0.3.0': 'Some **Markdown** release _notes_ from a prior version', 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 fac6ef275..f38cb28d5 100644 --- a/frontend/projects/ui/src/app/services/api/mock-patch.ts +++ b/frontend/projects/ui/src/app/services/api/mock-patch.ts @@ -33,7 +33,7 @@ export const mockPatchData: DataModel = { }, 'server-info': { id: 'abcdefgh', - version: '0.3.2', + version: '0.3.2.1', 'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(), 'lan-address': 'https://embassy-abcdefgh.local', 'tor-address': 'http://myveryownspecialtoraddress.onion', diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock index dd0531638..e9a8ffccd 100644 --- a/system-images/compat/Cargo.lock +++ b/system-images/compat/Cargo.lock @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "embassy-os" -version = "0.3.2" +version = "0.3.2-rev.1" dependencies = [ "aes", "async-stream",