diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends index 5438432e4..5209b5421 100644 --- a/build/dpkg-deps/depends +++ b/build/dpkg-deps/depends @@ -41,6 +41,7 @@ qemu-guest-agent rsync samba-common-bin smartmontools +socat sqlite3 squashfs-tools sudo diff --git a/core/Cargo.lock b/core/Cargo.lock index 5a5552829..7eaac03bd 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -4577,7 +4577,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.5-rev.1" +version = "0.3.5-rev.2" dependencies = [ "aes", "async-compression", diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml index 12e2696ac..d9d4a4e36 100644 --- a/core/startos/Cargo.toml +++ b/core/startos/Cargo.toml @@ -14,7 +14,7 @@ keywords = [ name = "start-os" readme = "README.md" repository = "https://github.com/Start9Labs/start-os" -version = "0.3.5-rev.1" +version = "0.3.5-rev.2" license = "MIT" [lib] diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs index 8ff42522f..181b5fe4b 100644 --- a/core/startos/src/version/mod.rs +++ b/core/startos/src/version/mod.rs @@ -10,6 +10,7 @@ use crate::Error; mod v0_3_5; mod v0_3_5_1; +mod v0_3_5_2; mod v0_3_6; pub type Current = v0_3_6::Version; @@ -20,6 +21,7 @@ enum Version { LT0_3_5(LTWrapper), V0_3_5(Wrapper), V0_3_5_1(Wrapper), + V0_3_5_2(Wrapper), V0_3_6(Wrapper), Other(emver::Version), } @@ -39,6 +41,7 @@ impl Version { Version::LT0_3_5(LTWrapper(_, x)) => x.clone(), Version::V0_3_5(Wrapper(x)) => x.semver(), Version::V0_3_5_1(Wrapper(x)) => x.semver(), + Version::V0_3_5_2(Wrapper(x)) => x.semver(), Version::V0_3_6(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } @@ -208,6 +211,7 @@ pub async fn init(db: &PatchDb) -> Result<(), Error> { } Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), &db).await?, Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), &db).await?, + Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), &db).await?, Version::V0_3_6(v) => v.0.migrate_to(&Current::new(), &db).await?, Version::Other(_) => { return Err(Error::new( @@ -242,6 +246,7 @@ mod tests { prop_oneof![ Just(Version::V0_3_5(Wrapper(v0_3_5::Version::new()))), Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::new()))), + Just(Version::V0_3_5_2(Wrapper(v0_3_5_2::Version::new()))), em_version().prop_map(Version::Other), ] } diff --git a/core/startos/src/version/v0_3_5_2.rs b/core/startos/src/version/v0_3_5_2.rs new file mode 100644 index 000000000..c70623a04 --- /dev/null +++ b/core/startos/src/version/v0_3_5_2.rs @@ -0,0 +1,29 @@ +use emver::VersionRange; + +use super::v0_3_5::V0_3_0_COMPAT; +use super::{v0_3_5_1, VersionT}; +use crate::prelude::*; + +const V0_3_5_2: emver::Version = emver::Version::new(0, 3, 5, 2); + +#[derive(Clone, Debug)] +pub struct Version; + +impl VersionT for Version { + type Previous = v0_3_5_1::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> emver::Version { + V0_3_5_2 + } + fn compat(&self) -> &'static VersionRange { + &V0_3_0_COMPAT + } + async fn up(&self, _db: &PatchDb) -> Result<(), Error> { + Ok(()) + } + async fn down(&self, _db: &PatchDb) -> Result<(), Error> { + Ok(()) + } +} diff --git a/web/package.json b/web/package.json index e4ae2220f..9e842455e 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "startos-ui", - "version": "0.3.5.1", + "version": "0.3.5.2", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "scripts": { diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json index 0a678d4e8..30eb8900b 100644 --- a/web/patchdb-ui-seed.json +++ b/web/patchdb-ui-seed.json @@ -1,6 +1,6 @@ { "name": null, - "ack-welcome": "0.3.5.1", + "ack-welcome": "0.3.5.2", "marketplace": { "selected-url": "https://registry.start9.com/", "known-hosts": { diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html index 23bc7e1fd..292480e09 100644 --- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html +++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html @@ -12,11 +12,11 @@

This Release

-

0.3.5.1

+

0.3.5.2

View the complete @@ -32,6 +32,19 @@

Previous 0.3.5.x Releases

+

0.3.5.1

+

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

+

0.3.5

View the complete diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts index 4ceaff1f9..61866b39a 100644 --- a/web/projects/ui/src/app/services/api/api.fixures.ts +++ b/web/projects/ui/src/app/services/api/api.fixures.ts @@ -18,9 +18,10 @@ export module Mock { shuttingDown: false, } export const MarketplaceEos: RR.GetMarketplaceEosRes = { - version: '0.3.5.1', + version: '0.3.5.2', headline: 'Our biggest release ever.', releaseNotes: { + '0.3.5.2': 'Some **Markdown** release _notes_ for 0.3.5.2', '0.3.5.1': 'Some **Markdown** release _notes_ for 0.3.5.1', '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', diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts index 5d876cf30..00c200440 100644 --- a/web/projects/ui/src/app/services/api/mock-patch.ts +++ b/web/projects/ui/src/app/services/api/mock-patch.ts @@ -37,7 +37,7 @@ export const mockPatchData: DataModel = { arch: 'x86_64', onionAddress: 'myveryownspecialtoraddress', id: 'abcdefgh', - version: '0.3.5.1', + version: '0.3.5.2', lastBackup: new Date(new Date().valueOf() - 604800001).toISOString(), lanAddress: 'https://adjective-noun.local', torAddress: 'https://myveryownspecialtoraddress.onion',