From a551bc53757369be9c2fb5477ab289184b016ded Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:50:29 -0700 Subject: [PATCH] bump version (#2520) * bump version * Update image-recipe/build.sh * fix podman repo * switch back to unstable for podman --- core/Cargo.lock | 2 +- core/startos/Cargo.toml | 2 +- core/startos/src/lib.rs | 2 -- core/startos/src/version/mod.rs | 9 +++++++- core/startos/src/version/v0_3_5_1.rs | 32 ++++++++++++++++++++++++++++ image-recipe/build.sh | 4 ++-- system-images/compat/Cargo.lock | 2 +- 7 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 core/startos/src/version/v0_3_5_1.rs diff --git a/core/Cargo.lock b/core/Cargo.lock index 8e3d423ab..dab184deb 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -4921,7 +4921,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.5" +version = "0.3.5-rev.1" dependencies = [ "aes", "async-compression", diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml index 95a8fb016..c794b4a06 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" +version = "0.3.5-rev.1" license = "MIT" [lib] diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs index 141ef1780..5dac1f628 100644 --- a/core/startos/src/lib.rs +++ b/core/startos/src/lib.rs @@ -1,5 +1,3 @@ -#![recursion_limit = "256"] - pub const DEFAULT_MARKETPLACE: &str = "https://registry.start9.com"; // pub const COMMUNITY_MARKETPLACE: &str = "https://community-registry.start9.com"; pub const BUFFER_SIZE: usize = 1024; diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs index 929d76dfc..4c6f157a5 100644 --- a/core/startos/src/version/mod.rs +++ b/core/startos/src/version/mod.rs @@ -14,8 +14,9 @@ mod v0_3_4_2; mod v0_3_4_3; mod v0_3_4_4; mod v0_3_5; +mod v0_3_5_1; -pub type Current = v0_3_5::Version; +pub type Current = v0_3_5_1::Version; #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)] #[serde(untagged)] @@ -26,6 +27,7 @@ enum Version { V0_3_4_3(Wrapper), V0_3_4_4(Wrapper), V0_3_5(Wrapper), + V0_3_5_1(Wrapper), Other(emver::Version), } @@ -47,6 +49,7 @@ impl Version { Version::V0_3_4_3(Wrapper(x)) => x.semver(), 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::Other(x) => x.clone(), } } @@ -172,6 +175,7 @@ pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> { Version::V0_3_4_3(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, 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::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), @@ -208,6 +212,9 @@ mod tests { 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()))), Just(Version::V0_3_4_3(Wrapper(v0_3_4_3::Version::new()))), + 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()))), em_version().prop_map(Version::Other), ] } diff --git a/core/startos/src/version/v0_3_5_1.rs b/core/startos/src/version/v0_3_5_1.rs new file mode 100644 index 000000000..c004dc8b6 --- /dev/null +++ b/core/startos/src/version/v0_3_5_1.rs @@ -0,0 +1,32 @@ +use async_trait::async_trait; +use emver::VersionRange; +use sqlx::PgPool; + +use super::v0_3_4::V0_3_0_COMPAT; +use super::{v0_3_5, VersionT}; +use crate::prelude::*; + +const V0_3_5_1: emver::Version = emver::Version::new(0, 3, 5, 1); + +#[derive(Clone, Debug)] +pub struct Version; + +#[async_trait] +impl VersionT for Version { + type Previous = v0_3_5::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> emver::Version { + V0_3_5_1 + } + 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(()) + } +} diff --git a/image-recipe/build.sh b/image-recipe/build.sh index bfc7921d9..633944642 100755 --- a/image-recipe/build.sh +++ b/image-recipe/build.sh @@ -158,8 +158,8 @@ echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/tor.key.gpg] curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o config/archives/docker.key echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/docker.key.gpg] https://download.docker.com/linux/debian ${IB_SUITE} stable" > config/archives/docker.list -curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key -echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Testing/ /" > config/archives/podman.list +curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key +echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/ /" > config/archives/podman.list # Dependencies diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock index 0c646aebf..9ce44203a 100644 --- a/system-images/compat/Cargo.lock +++ b/system-images/compat/Cargo.lock @@ -4399,7 +4399,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.5" +version = "0.3.5-rev.1" dependencies = [ "aes", "async-compression",