v0.3.4.2 (#2269)

Start9Labs · May 12, 2023 · 2e6fc7e · 2e6fc7e
1 parent 4a8f323
commit 2e6fc7e
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 10 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "embassy-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.4-rev.1"
+version = "0.3.4-rev.2"
 
 [lib]
 name = "embassy"

diff --git a/backend/src/version/mod.rs b/backend/src/version/mod.rs
@@ -21,8 +21,9 @@ mod v0_3_2_1;
 mod v0_3_3;
 mod v0_3_4;
 mod v0_3_4_1;
+mod v0_3_4_2;
 
-pub type Current = v0_3_4_1::Version;
+pub type Current = v0_3_4_2::Version;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
@@ -39,6 +40,7 @@ enum Version {
     V0_3_3(Wrapper<v0_3_3::Version>),
     V0_3_4(Wrapper<v0_3_4::Version>),
     V0_3_4_1(Wrapper<v0_3_4_1::Version>),
+    V0_3_4_2(Wrapper<v0_3_4_2::Version>),
     Other(emver::Version),
 }
 
@@ -66,6 +68,7 @@ impl Version {
             Version::V0_3_3(Wrapper(x)) => x.semver(),
             Version::V0_3_4(Wrapper(x)) => x.semver(),
             Version::V0_3_4_1(Wrapper(x)) => x.semver(),
+            Version::V0_3_4_2(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
@@ -251,6 +254,10 @@ pub async fn init<Db: DbHandle>(
             v.0.migrate_to(&Current::new(), db, secrets, receipts)
                 .await?
         }
+        Version::V0_3_4_2(v) => {
+            v.0.migrate_to(&Current::new(), db, secrets, receipts)
+                .await?
+        }
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
@@ -295,6 +302,7 @@ mod tests {
             Just(Version::V0_3_3(Wrapper(v0_3_3::Version::new()))),
             Just(Version::V0_3_4(Wrapper(v0_3_4::Version::new()))),
             Just(Version::V0_3_4_1(Wrapper(v0_3_4_1::Version::new()))),
+            Just(Version::V0_3_4_2(Wrapper(v0_3_4_2::Version::new()))),
             em_version().prop_map(Version::Other),
         ]
     }

diff --git a/backend/src/version/v0_3_4_2.rs b/backend/src/version/v0_3_4_2.rs
@@ -0,0 +1,30 @@
+use async_trait::async_trait;
+use emver::VersionRange;
+
+use super::v0_3_0::V0_3_0_COMPAT;
+use super::*;
+
+const V0_3_4_2: emver::Version = emver::Version::new(0, 3, 4, 2);
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+#[async_trait]
+impl VersionT for Version {
+    type Previous = v0_3_4_1::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> emver::Version {
+        V0_3_4_2
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &*V0_3_0_COMPAT
+    }
+    async fn up<Db: DbHandle>(&self, _db: &mut Db, _secrets: &PgPool) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down<Db: DbHandle>(&self, _db: &mut Db, _secrets: &PgPool) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "start-os",
+  "name": "startos-ui",
   "version": "0.3.4.2",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",

diff --git a/frontend/patchdb-ui-seed.json b/frontend/patchdb-ui-seed.json
@@ -1,6 +1,6 @@
 {
   "name": null,
-  "ack-welcome": "0.3.4.1",
+  "ack-welcome": "0.3.4.2",
   "marketplace": {
     "selected-url": "https://registry.start9.com/",
     "known-hosts": {

diff --git 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,12 @@ export module Mock {
     updated: true,
   }
   export const MarketplaceEos: RR.GetMarketplaceEosRes = {
-    version: '0.3.4',
+    version: '0.3.4.2',
     headline: 'Our biggest release ever.',
     'release-notes': {
+      '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',
+      '0.3.4': 'Some **Markdown** release _notes_ for 0.3.4',
       '0.3.3': 'Some **Markdown** release _notes_ for 0.3.3',
       '0.3.2.1': 'Some **Markdown** release _notes_ for 0.3.2.1',
       '0.3.2': 'Some **Markdown** release _notes_ for 0.3.2',

diff --git 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',
+    version: '0.3.4.2',
     'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(),
     'lan-address': 'https://adjective-noun.local',
     'tor-address': 'http://myveryownspecialtoraddress.onion',

diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock