diff --git a/core/Cargo.lock b/core/Cargo.lock index 957f835a8..1a562388e 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -6023,7 +6023,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "start-os" -version = "0.4.0-alpha.3" +version = "0.4.0-alpha.4" dependencies = [ "aes 0.7.5", "async-acme", diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml index 417709166..8a32ae561 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.4.0-alpha.3" # VERSION_BUMP +version = "0.4.0-alpha.4" # VERSION_BUMP license = "MIT" [lib] diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs index c2705ed10..6919edb7d 100644 --- a/core/startos/src/version/mod.rs +++ b/core/startos/src/version/mod.rs @@ -43,8 +43,9 @@ mod v0_4_0_alpha_0; mod v0_4_0_alpha_1; mod v0_4_0_alpha_2; mod v0_4_0_alpha_3; +mod v0_4_0_alpha_4; -pub type Current = v0_4_0_alpha_3::Version; // VERSION_BUMP +pub type Current = v0_4_0_alpha_4::Version; // VERSION_BUMP impl Current { #[instrument(skip(self, db))] @@ -151,7 +152,8 @@ enum Version { V0_4_0_alpha_0(Wrapper), V0_4_0_alpha_1(Wrapper), V0_4_0_alpha_2(Wrapper), - V0_4_0_alpha_3(Wrapper), // VERSION_BUMP + V0_4_0_alpha_3(Wrapper), + V0_4_0_alpha_4(Wrapper), // VERSION_BUMP Other(exver::Version), } @@ -197,7 +199,8 @@ impl Version { Self::V0_4_0_alpha_0(v) => DynVersion(Box::new(v.0)), Self::V0_4_0_alpha_1(v) => DynVersion(Box::new(v.0)), Self::V0_4_0_alpha_2(v) => DynVersion(Box::new(v.0)), - Self::V0_4_0_alpha_3(v) => DynVersion(Box::new(v.0)), // VERSION_BUMP + Self::V0_4_0_alpha_3(v) => DynVersion(Box::new(v.0)), + Self::V0_4_0_alpha_4(v) => DynVersion(Box::new(v.0)), // VERSION_BUMP Self::Other(v) => { return Err(Error::new( eyre!("unknown version {v}"), @@ -235,7 +238,8 @@ impl Version { Version::V0_4_0_alpha_0(Wrapper(x)) => x.semver(), Version::V0_4_0_alpha_1(Wrapper(x)) => x.semver(), Version::V0_4_0_alpha_2(Wrapper(x)) => x.semver(), - Version::V0_4_0_alpha_3(Wrapper(x)) => x.semver(), // VERSION_BUMP + Version::V0_4_0_alpha_3(Wrapper(x)) => x.semver(), + Version::V0_4_0_alpha_4(Wrapper(x)) => x.semver(), // VERSION_BUMP Version::Other(x) => x.clone(), } } diff --git a/core/startos/src/version/v0_4_0_alpha_2.rs b/core/startos/src/version/v0_4_0_alpha_2.rs index 2196747fc..81908c0f0 100644 --- a/core/startos/src/version/v0_4_0_alpha_2.rs +++ b/core/startos/src/version/v0_4_0_alpha_2.rs @@ -1,5 +1,4 @@ use exver::{PreReleaseSegment, VersionRange}; -use imbl_value::json; use super::v0_3_5::V0_3_0_COMPAT; use super::{v0_4_0_alpha_1, VersionT}; diff --git a/core/startos/src/version/v0_4_0_alpha_3.rs b/core/startos/src/version/v0_4_0_alpha_3.rs index e6fadd778..6cbf21573 100644 --- a/core/startos/src/version/v0_4_0_alpha_3.rs +++ b/core/startos/src/version/v0_4_0_alpha_3.rs @@ -1,5 +1,4 @@ use exver::{PreReleaseSegment, VersionRange}; -use imbl_value::json; use super::v0_3_5::V0_3_0_COMPAT; use super::{v0_4_0_alpha_2, VersionT}; diff --git a/core/startos/src/version/v0_4_0_alpha_4.rs b/core/startos/src/version/v0_4_0_alpha_4.rs new file mode 100644 index 000000000..ef574be27 --- /dev/null +++ b/core/startos/src/version/v0_4_0_alpha_4.rs @@ -0,0 +1,36 @@ +use exver::{PreReleaseSegment, VersionRange}; + +use super::v0_3_5::V0_3_0_COMPAT; +use super::{v0_4_0_alpha_3, VersionT}; +use crate::prelude::*; + +lazy_static::lazy_static! { + static ref V0_4_0_alpha_4: exver::Version = exver::Version::new( + [0, 4, 0], + [PreReleaseSegment::String("alpha".into()), 4.into()] + ); +} + +#[derive(Clone, Copy, Debug, Default)] +pub struct Version; + +impl VersionT for Version { + type Previous = v0_4_0_alpha_3::Version; + type PreUpRes = (); + + async fn pre_up(self) -> Result { + Ok(()) + } + fn semver(self) -> exver::Version { + V0_4_0_alpha_4.clone() + } + fn compat(self) -> &'static VersionRange { + &V0_3_0_COMPAT + } + fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> { + Ok(()) + } + fn down(self, _db: &mut Value) -> Result<(), Error> { + Ok(()) + } +} diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts index 7a3f267a6..d639e6976 100644 --- a/sdk/package/lib/StartSdk.ts +++ b/sdk/package/lib/StartSdk.ts @@ -52,7 +52,7 @@ import * as actions from "../../base/lib/actions" import { setupInit } from "./inits/setupInit" import * as fs from "node:fs/promises" -export const OSVersion = testTypeVersion("0.4.0-alpha.3") +export const OSVersion = testTypeVersion("0.4.0-alpha.4") // prettier-ignore type AnyNeverCond = diff --git a/web/package-lock.json b/web/package-lock.json index 8b5f06b36..db8c72d1f 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "startos-ui", - "version": "0.4.0-alpha.3", + "version": "0.4.0-alpha.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "startos-ui", - "version": "0.4.0-alpha.3", + "version": "0.4.0-alpha.4", "license": "MIT", "dependencies": { "@angular/animations": "^17.3.1", diff --git a/web/package.json b/web/package.json index 9590a5684..ee17e1f8f 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "startos-ui", - "version": "0.4.0-alpha.3", + "version": "0.4.0-alpha.4", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "license": "MIT", 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 59816139b..d60c6f175 100644 --- a/web/projects/ui/src/app/services/api/api.fixures.ts +++ b/web/projects/ui/src/app/services/api/api.fixures.ts @@ -101,16 +101,16 @@ export namespace Mock { }, img: {}, }, - '0.4.0-alpha.3': { - headline: 'v0.4.0-alpha.3', + '0.4.0-alpha.4': { + headline: 'v0.4.0-alpha.4', releaseNotes: '', - sourceVersion: '>=0.3.5:0 <=0.4.0-alpha.3:0', + sourceVersion: '>=0.3.5:0 <=0.4.0-alpha.4:0', authorized: ['G24CSA5HNYEPIXJNMK7ZM4KD5SX5N6X4'], iso: {}, squashfs: { aarch64: { publishedAt: '2025-04-21T20:58:48.140749883Z', - url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.3/startos-0.4.0-alpha.3-33ae46f~dev_aarch64.squashfs', + url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.4/startos-0.4.0-alpha.4-33ae46f~dev_aarch64.squashfs', commitment: { hash: '4elBFVkd/r8hNadKmKtLIs42CoPltMvKe2z3LRqkphk=', size: 1343500288, @@ -122,7 +122,7 @@ export namespace Mock { }, 'aarch64-nonfree': { publishedAt: '2025-04-21T21:07:00.249285116Z', - url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.3/startos-0.4.0-alpha.3-33ae46f~dev_aarch64-nonfree.squashfs', + url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.4/startos-0.4.0-alpha.4-33ae46f~dev_aarch64-nonfree.squashfs', commitment: { hash: 'MrCEi4jxbmPS7zAiGk/JSKlMsiuKqQy6RbYOxlGHOIQ=', size: 1653075968, @@ -134,7 +134,7 @@ export namespace Mock { }, raspberrypi: { publishedAt: '2025-04-21T21:16:12.933319237Z', - url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.3/startos-0.4.0-alpha.3-33ae46f~dev_raspberrypi.squashfs', + url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.4/startos-0.4.0-alpha.4-33ae46f~dev_raspberrypi.squashfs', commitment: { hash: '/XTVQRCqY3RK544PgitlKu7UplXjkmzWoXUh2E4HCw0=', size: 1490731008, @@ -146,7 +146,7 @@ export namespace Mock { }, x86_64: { publishedAt: '2025-04-21T21:14:20.246908903Z', - url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.3/startos-0.4.0-alpha.3-33ae46f~dev_x86_64.squashfs', + url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.4/startos-0.4.0-alpha.4-33ae46f~dev_x86_64.squashfs', commitment: { hash: '/6romKTVQGSaOU7FqSZdw0kFyd7P+NBSYNwM3q7Fe44=', size: 1411657728, @@ -158,7 +158,7 @@ export namespace Mock { }, 'x86_64-nonfree': { publishedAt: '2025-04-21T21:15:17.955265284Z', - url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.3/startos-0.4.0-alpha.3-33ae46f~dev_x86_64-nonfree.squashfs', + url: 'https://alpha-registry-x.start9.com/startos/v0.4.0-alpha.4/startos-0.4.0-alpha.4-33ae46f~dev_x86_64-nonfree.squashfs', commitment: { hash: 'HCRq9sr/0t85pMdrEgNBeM4x11zVKHszGnD1GDyZbSE=', size: 1731035136,