From 825e18a55198bf4ab56946412697c925aa6396d1 Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Fri, 14 Jul 2023 14:58:19 -0600 Subject: [PATCH] version bump (#2357) * version bump * update welcome page --------- Co-authored-by: Lucy Cifferello <12953208+elvece@users.noreply.github.com> --- backend/Cargo.lock | 2 +- backend/Cargo.toml | 2 +- backend/src/version/mod.rs | 9 ++++- backend/src/version/v0_3_4_4.rs | 36 +++++++++++++++++++ frontend/package-lock.json | 4 +-- frontend/package.json | 2 +- frontend/patchdb-ui-seed.json | 2 +- .../modals/os-welcome/os-welcome.page.html | 28 +++++++++++++-- .../ui/src/app/services/api/api.fixures.ts | 3 +- .../ui/src/app/services/api/mock-patch.ts | 2 +- system-images/compat/Cargo.lock | 2 +- 11 files changed, 79 insertions(+), 13 deletions(-) create mode 100644 backend/src/version/v0_3_4_4.rs diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 3bdbd65f2..11e16fa9c 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -4559,7 +4559,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.4-rev.3" +version = "0.3.4-rev.4" dependencies = [ "aes", "async-compression", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index ea8496880..901466606 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -14,7 +14,7 @@ keywords = [ name = "start-os" readme = "README.md" repository = "https://github.com/Start9Labs/start-os" -version = "0.3.4-rev.3" +version = "0.3.4-rev.4" [lib] name = "startos" diff --git a/backend/src/version/mod.rs b/backend/src/version/mod.rs index 7425e522f..797d8fb8d 100644 --- a/backend/src/version/mod.rs +++ b/backend/src/version/mod.rs @@ -23,8 +23,9 @@ mod v0_3_4; mod v0_3_4_1; mod v0_3_4_2; mod v0_3_4_3; +mod v0_3_4_4; -pub type Current = v0_3_4_3::Version; +pub type Current = v0_3_4_4::Version; #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)] #[serde(untagged)] @@ -43,6 +44,7 @@ enum Version { V0_3_4_1(Wrapper), V0_3_4_2(Wrapper), V0_3_4_3(Wrapper), + V0_3_4_4(Wrapper), Other(emver::Version), } @@ -72,6 +74,7 @@ impl Version { Version::V0_3_4_1(Wrapper(x)) => x.semver(), Version::V0_3_4_2(Wrapper(x)) => x.semver(), Version::V0_3_4_3(Wrapper(x)) => x.semver(), + Version::V0_3_4_4(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } } @@ -265,6 +268,10 @@ pub async fn init( v.0.migrate_to(&Current::new(), db, secrets, receipts) .await? } + Version::V0_3_4_4(v) => { + v.0.migrate_to(&Current::new(), db, secrets, receipts) + .await? + } Version::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), diff --git a/backend/src/version/v0_3_4_4.rs b/backend/src/version/v0_3_4_4.rs new file mode 100644 index 000000000..bd994911a --- /dev/null +++ b/backend/src/version/v0_3_4_4.rs @@ -0,0 +1,36 @@ +use async_trait::async_trait; +use emver::VersionRange; + +use super::v0_3_0::V0_3_0_COMPAT; +use super::*; + +const V0_3_4_4: emver::Version = emver::Version::new(0, 3, 4, 4); + +#[derive(Clone, Debug)] +pub struct Version; + +#[async_trait] +impl VersionT for Version { + type Previous = v0_3_4_3::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> emver::Version { + V0_3_4_4 + } + fn compat(&self) -> &'static VersionRange { + &*V0_3_0_COMPAT + } + async fn up(&self, db: &mut Db, _secrets: &PgPool) -> Result<(), Error> { + crate::db::DatabaseModel::new() + .server_info() + .get_mut(db) + .await? + .save(db) + .await?; + Ok(()) + } + async fn down(&self, _db: &mut Db, _secrets: &PgPool) -> Result<(), Error> { + Ok(()) + } +} diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 17651b20c..c5ad718d5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "startos-ui", - "version": "0.3.4.3", + "version": "0.3.4.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "startos-ui", - "version": "0.3.4.3", + "version": "0.3.4.4", "dependencies": { "@angular/animations": "^14.1.0", "@angular/common": "^14.1.0", diff --git a/frontend/package.json b/frontend/package.json index 20a0ea90a..244f58ac7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "startos-ui", - "version": "0.3.4.3", + "version": "0.3.4.4", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "scripts": { diff --git a/frontend/patchdb-ui-seed.json b/frontend/patchdb-ui-seed.json index bf6ca2c91..88328e827 100644 --- a/frontend/patchdb-ui-seed.json +++ b/frontend/patchdb-ui-seed.json @@ -1,6 +1,6 @@ { "name": null, - "ack-welcome": "0.3.4.3", + "ack-welcome": "0.3.4.4", "marketplace": { "selected-url": "https://registry.start9.com/", "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 cddf37d15..e0af5cf2b 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 @@ -12,6 +12,30 @@

This Release

+

0.3.4.4

+

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

+
Highlights
+
    +
  • Enhanced performance for page load times
    • +
  • Improved progress reporting for data transfer to new data drives
    • +
  • Enabled use of IP address for local network backups
    • +
  • Added change password flow to the UI
    • +
  • Disabled LUKS for new Raspberry Pi setups
    • +
  • Fixed miscellaneous bugs
    • +
+ +

Previous Releases

+

0.3.4.3

View the complete @@ -28,12 +52,10 @@

  • Improved Tor reliability
  • Experimental features tab
    • -
  • multiple bugfixes and general performance enhancements
    • +
  • Multiple bugfixes and general performance enhancements
  • Update branding
-

Previous Releases

-

0.3.4.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 d39df0880..6e999e956 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.4.3', + version: '0.3.4.4', headline: 'Our biggest release ever.', 'release-notes': { + '0.3.4.4': 'Some **Markdown** release _notes_ for 0.3.4.4', '0.3.4.3': 'Some **Markdown** release _notes_ for 0.3.4.3', '0.3.4.2': 'Some **Markdown** release _notes_ for 0.3.4.2', '0.3.4.1': 'Some **Markdown** release _notes_ for 0.3.4.1', 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 1c687c023..114ee9b30 100644 --- a/frontend/projects/ui/src/app/services/api/mock-patch.ts +++ b/frontend/projects/ui/src/app/services/api/mock-patch.ts @@ -44,7 +44,7 @@ export const mockPatchData: DataModel = { }, 'server-info': { id: 'abcdefgh', - version: '0.3.4.3', + version: '0.3.4.4', 'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(), 'lan-address': 'https://adjective-noun.local', 'tor-address': 'https://myveryownspecialtoraddress.onion', diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock index b3f185406..fe2d17395 100644 --- a/system-images/compat/Cargo.lock +++ b/system-images/compat/Cargo.lock @@ -4133,7 +4133,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.4-rev.3" +version = "0.3.4-rev.4" dependencies = [ "aes", "async-compression",