Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Initial commit for the bump to 0.3.5.2 #2541

Merged
merged 3 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/startos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
7 changes: 6 additions & 1 deletion core/startos/src/version/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ mod v0_3_4_3;
mod v0_3_4_4;
mod v0_3_5;
mod v0_3_5_1;
mod v0_3_5_2;

pub type Current = v0_3_5_1::Version;
pub type Current = v0_3_5_2::Version;

#[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
#[serde(untagged)]
Expand All @@ -28,6 +29,7 @@ enum Version {
V0_3_4_4(Wrapper<v0_3_4_4::Version>),
V0_3_5(Wrapper<v0_3_5::Version>),
V0_3_5_1(Wrapper<v0_3_5_1::Version>),
V0_3_5_2(Wrapper<v0_3_5_2::Version>),
Other(emver::Version),
}

Expand All @@ -50,6 +52,7 @@ impl Version {
Version::V0_3_4_4(Wrapper(x)) => x.semver(),
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::Other(x) => x.clone(),
}
}
Expand Down Expand Up @@ -176,6 +179,7 @@ pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> {
Version::V0_3_4_4(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
Version::Other(_) => {
return Err(Error::new(
eyre!("Cannot downgrade"),
Expand Down Expand Up @@ -215,6 +219,7 @@ mod tests {
Just(Version::V0_3_4_4(Wrapper(v0_3_4_4::Version::new()))),
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),
]
}
Expand Down
32 changes: 32 additions & 0 deletions core/startos/src/version/v0_3_5_2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
use async_trait::async_trait;
use emver::VersionRange;
use sqlx::PgPool;

use super::VersionT;
use super::{v0_3_4::V0_3_0_COMPAT, v0_3_5_1};
use crate::prelude::*;

const V0_3_5_2: emver::Version = emver::Version::new(0, 3, 5, 2);

#[derive(Clone, Debug)]
pub struct Version;

#[async_trait]
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, _secrets: &PgPool) -> Result<(), Error> {
Ok(())
}
async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
Ok(())
}
}
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion web/patchdb-ui-seed.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
17 changes: 15 additions & 2 deletions web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
<ion-content class="ion-padding">
<h2>This Release</h2>

<h4>0.3.5.1</h4>
<h4>0.3.5.2</h4>
<p class="note-padding">
View the complete
<a
href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.1"
href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.2"
target="_blank"
noreferrer
>
Expand All @@ -32,6 +32,19 @@ <h6>Highlights</h6>

<h2>Previous 0.3.5.x Releases</h2>

<h4>0.3.5.1</h4>
<p class="note-padding">
View the complete
<a
href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.1"
target="_blank"
noreferrer
>
release notes
</a>
for more details.
</p>

<h4>0.3.5</h4>
<p class="note-padding">
View the complete
Expand Down
3 changes: 2 additions & 1 deletion web/projects/ui/src/app/services/api/api.fixures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ export module Mock {
'shutting-down': false,
}
export const MarketplaceEos: RR.GetMarketplaceEosRes = {
version: '0.3.5.1',
version: '0.3.5.2',
headline: 'Our biggest release ever.',
'release-notes': {
'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',
Expand Down
2 changes: 1 addition & 1 deletion web/projects/ui/src/app/services/api/mock-patch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const mockPatchData: DataModel = {
},
'server-info': {
id: 'abcdefgh',
version: '0.3.5.1',
version: '0.3.5.2',
'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(),
'lan-address': 'https://adjective-noun.local',
'tor-address': 'https://myveryownspecialtoraddress.onion',
Expand Down