From 9b88de656e54a4f3724cc9ffb90a2f955f3ca93f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 17 Mar 2023 12:55:21 -0600
Subject: [PATCH] version bump (#2232)

* version bump

* welcome notes

* 0341 release notes

---------

Co-authored-by: Matt Hill <matthewonthemoon@gmail.com>
---
 backend/Cargo.lock                            |  2 +-
 backend/Cargo.toml                            |  2 +-
 backend/src/version/mod.rs                    | 10 ++++++-
 backend/src/version/v0_3_4_1.rs               | 30 +++++++++++++++++++
 frontend/package.json                         |  2 +-
 frontend/patchdb-ui-seed.json                 |  2 +-
 .../modals/os-welcome/os-welcome.page.html    | 22 +++++++++++++-
 system-images/compat/Cargo.lock               |  2 +-
 8 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 backend/src/version/v0_3_4_1.rs

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 10f9ace85..ebfbb954e 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1354,7 +1354,7 @@ dependencies = [
 
 [[package]]
 name = "embassy-os"
-version = "0.3.4"
+version = "0.3.4-rev.1"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index de1d29a53..7fac446a9 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.4"
+version = "0.3.4-rev.1"
 
 [lib]
 name = "embassy"
diff --git a/backend/src/version/mod.rs b/backend/src/version/mod.rs
index 48f914ee2..9bd59c4dd 100644
--- a/backend/src/version/mod.rs
+++ b/backend/src/version/mod.rs
@@ -20,8 +20,9 @@ mod v0_3_2;
 mod v0_3_2_1;
 mod v0_3_3;
 mod v0_3_4;
+mod v0_3_4_1;
 
-pub type Current = v0_3_4::Version;
+pub type Current = v0_3_4_1::Version;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
@@ -37,6 +38,7 @@ enum Version {
     V0_3_2_1(Wrapper<v0_3_2_1::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>),
     Other(emver::Version),
 }
 
@@ -63,6 +65,7 @@ impl Version {
             Version::V0_3_2_1(Wrapper(x)) => x.semver(),
             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::Other(x) => x.clone(),
         }
     }
@@ -244,6 +247,10 @@ pub async fn init<Db: DbHandle>(
             v.0.migrate_to(&Current::new(), db, secrets, receipts)
                 .await?
         }
+        Version::V0_3_4_1(v) => {
+            v.0.migrate_to(&Current::new(), db, secrets, receipts)
+                .await?
+        }
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
@@ -287,6 +294,7 @@ mod tests {
             Just(Version::V0_3_2_1(Wrapper(v0_3_2_1::Version::new()))),
             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(Wrapper(v0_3_4_1::Version::new()))),
             em_version().prop_map(Version::Other),
         ]
     }
diff --git a/backend/src/version/v0_3_4_1.rs b/backend/src/version/v0_3_4_1.rs
new file mode 100644
index 000000000..ecd42ea6a
--- /dev/null
+++ b/backend/src/version/v0_3_4_1.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_1: emver::Version = emver::Version::new(0, 3, 4, 1);
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+#[async_trait]
+impl VersionT for Version {
+    type Previous = v0_3_3::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> emver::Version {
+        V0_3_4_1
+    }
+    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.json b/frontend/package.json
index 681dd2d04..3f4d061ac 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "embassy-os",
-  "version": "0.3.4",
+  "version": "0.3.4.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 e32725588..c43d0b3b3 100644
--- a/frontend/patchdb-ui-seed.json
+++ b/frontend/patchdb-ui-seed.json
@@ -1,6 +1,6 @@
 {
   "name": null,
-  "ack-welcome": "0.3.4",
+  "ack-welcome": "0.3.4.1",
   "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 e7da7ab27..9b183c28a 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,27 @@
 </ion-header>
 
 <ion-content class="ion-padding">
-  <h2>This release</h2>
+  <h2>This Release</h2>
+
+  <h4>0.3.4.1</h4>
+  <p class="note-padding">
+    View the complete
+    <a
+      href="https://github.com/Start9Labs/embassy-os/releases/tag/v0.3.4.1"
+      target="_blank"
+      noreferrer
+    >
+      release notes
+    </a>
+    for more details.
+  </p>
+  <h6>Highlights</h6>
+  <ul class="spaced-list">
+    <li>0.3.4 bug fixes</li>
+  </ul>
+
+  <h2>Previous Releases</h2>
+
   <h4>0.3.4</h4>
   <p class="note-padding">
     View the complete
diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock
index 0bee6dca6..3e47d2028 100644
--- a/system-images/compat/Cargo.lock
+++ b/system-images/compat/Cargo.lock
@@ -1171,7 +1171,7 @@ dependencies = [
 
 [[package]]
 name = "embassy-os"
-version = "0.3.4"
+version = "0.3.4-rev.1"
 dependencies = [
  "aes",
  "async-compression",