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

v0.3.6-alpha.9 #2795

Open
wants to merge 3 commits into
base: next/minor
Choose a base branch
from
Open
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.6-alpha.8"
version = "0.3.6-alpha.9"
license = "MIT"

[lib]
Expand Down
6 changes: 5 additions & 1 deletion core/startos/src/version/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ mod v0_3_6_alpha_5;
mod v0_3_6_alpha_6;
mod v0_3_6_alpha_7;
mod v0_3_6_alpha_8;
mod v0_3_6_alpha_9;

pub type Current = v0_3_6_alpha_8::Version; // VERSION_BUMP
pub type Current = v0_3_6_alpha_9::Version; // VERSION_BUMP

impl Current {
#[instrument(skip(self, db))]
Expand Down Expand Up @@ -106,6 +107,7 @@ enum Version {
V0_3_6_alpha_6(Wrapper<v0_3_6_alpha_6::Version>),
V0_3_6_alpha_7(Wrapper<v0_3_6_alpha_7::Version>),
V0_3_6_alpha_8(Wrapper<v0_3_6_alpha_8::Version>),
V0_3_6_alpha_9(Wrapper<v0_3_6_alpha_9::Version>),
Other(exver::Version),
}

Expand Down Expand Up @@ -138,6 +140,7 @@ impl Version {
Self::V0_3_6_alpha_6(v) => DynVersion(Box::new(v.0)),
Self::V0_3_6_alpha_7(v) => DynVersion(Box::new(v.0)),
Self::V0_3_6_alpha_8(v) => DynVersion(Box::new(v.0)),
Self::V0_3_6_alpha_9(v) => DynVersion(Box::new(v.0)),
Self::Other(v) => {
return Err(Error::new(
eyre!("unknown version {v}"),
Expand All @@ -162,6 +165,7 @@ impl Version {
Version::V0_3_6_alpha_6(Wrapper(x)) => x.semver(),
Version::V0_3_6_alpha_7(Wrapper(x)) => x.semver(),
Version::V0_3_6_alpha_8(Wrapper(x)) => x.semver(),
Version::V0_3_6_alpha_9(Wrapper(x)) => x.semver(),
Version::Other(x) => x.clone(),
}
}
Expand Down
36 changes: 36 additions & 0 deletions core/startos/src/version/v0_3_6_alpha_9.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
use exver::{PreReleaseSegment, VersionRange};

use super::v0_3_5::V0_3_0_COMPAT;
use super::{v0_3_6_alpha_8, VersionT};
use crate::prelude::*;

lazy_static::lazy_static! {
static ref V0_3_6_alpha_9: exver::Version = exver::Version::new(
[0, 3, 6],
[PreReleaseSegment::String("alpha".into()), 9.into()]
);
}

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

impl VersionT for Version {
type Previous = v0_3_6_alpha_8::Version;
type PreUpRes = ();

async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
Ok(())
}
fn semver(self) -> exver::Version {
V0_3_6_alpha_9.clone()
}
fn compat(self) -> &'static VersionRange {
&V0_3_0_COMPAT
}
fn up(self, _: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
Ok(())
}
fn down(self, _db: &mut Value) -> Result<(), Error> {
Ok(())
}
}
4 changes: 2 additions & 2 deletions image-recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
echo "Configuring raspi kernel '\$v'"
extract-ikconfig "/usr/lib/modules/\$v/kernel/kernel/configs.ko.xz" > /boot/config-\$v
done
mkinitramfs -c gzip -o /boot/initramfs8 6.6.51-v8+
mkinitramfs -c gzip -o /boot/initramfs_2712 6.6.51-v8-16k+
mkinitramfs -c gzip -o /boot/initramfs8 6.6.62-v8+
mkinitramfs -c gzip -o /boot/initramfs_2712 6.6.62-v8-16k+
fi

useradd --shell /bin/bash -G embassy -m start9
Expand Down
4 changes: 2 additions & 2 deletions web/package-lock.json

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

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.6-alpha.8",
"version": "0.3.6-alpha.9",
"author": "Start9 Labs, Inc",
"homepage": "https://start9.com/",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion web/patchdb-ui-seed.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"ackInstructions": {},
"theme": "Dark",
"widgets": [],
"ack-welcome": "0.3.6-alpha.8"
"ack-welcome": "0.3.6-alpha.9"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ion-content class="ion-padding">
<h2>This Release</h2>

<h4>0.3.6-alpha.8</h4>
<h4>0.3.6-alpha.9</h4>
<h6>This is an ALPHA release! DO NOT use for production data!</h6>
<h6>
Expect that any data you create or store on this version of the OS can be
Expand Down