Skip to content

Switch to Heliosv3 #9929

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.

Sign up for GitHub

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

Draft
citrus-it wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Switch to Heliosv3 #9929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/buildomat/jobs/a4x2-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "a4x2-prepare"
#: variety = "basic"
#: target = "helios-2.0"
#: target = "helios-3.0"
#: rust_toolchain = true
#: output_rules = [
#: "=/out/cargo-bay-ce.tgz",
Expand Down
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/build-and-test-helios.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "build-and-test (helios)"
#: variety = "basic"
#: target = "helios-2.0"
#: target = "helios-3.0"
#: rust_toolchain = true
#: output_rules = [
#: "%/work/*",
Expand Down
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/check-features.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "check-features (helios)"
#: variety = "basic"
#: target = "helios-2.0"
#: target = "helios-3.0"
#: rust_toolchain = true
#: output_rules = [
#: "/out/*",
Expand Down
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/clippy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "clippy (helios)"
#: variety = "basic"
#: target = "helios-2.0"
#: target = "helios-3.0"
#: rust_toolchain = true
#: output_rules = []

Expand Down
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/omicron-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "omicron-common (helios)"
#: variety = "basic"
#: target = "helios-2.0"
#: target = "helios-3.0"
#: rust_toolchain = true
#: output_rules = []

Expand Down
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "helios / package"
#: variety = "basic"
#: target = "helios-2.0"
#: target = "helios-3.0"
#: rust_toolchain = true
#: output_rules = [
#: "=/work/package.tar.gz",
Expand Down
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/tuf-repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "helios / build TUF repo"
#: variety = "basic"
#: target = "helios-2.0"
#: target = "helios-3.0"
#: rust_toolchain = true
#: output_rules = [
#: "=/work/manifest.toml",
Expand Down
21 changes: 19 additions & 2 deletions dev-tools/releng/src/helios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use fs_err::tokio as fs;
use fs_err::tokio::File;
use serde::Deserialize;
use slog::Logger;
use std::path::Path;
use tokio::io::AsyncWriteExt;
use tokio::io::BufWriter;

Expand All @@ -23,7 +24,7 @@ const MANIFEST_PATH: &str = "incorporation.p5m";
const REPO_PATH: &str = "incorporation";
pub const ARCHIVE_PATH: &str = "incorporation.p5p";

pub const PUBLISHER: &str = "helios-dev";
pub const PUBLISHER: &str = "helios";

pub(crate) enum Action {
Generate { version: String },
Expand Down Expand Up @@ -119,9 +120,25 @@ async fn generate_incorporation_manifest(
fmri: String,
}

let stdout = Command::new("pkg")
.args([
"list",
"-H",
"-o",
"branch",
"-n",
"-g",
HELIOS_PKGREPO,
"release/name",
])
.ensure_stdout(&logger)
.await?;

let branch = stdout.trim();

let mut manifest = BufWriter::new(File::create(path).await?);
let preamble = format!(
r#"set name=pkg.fmri value=pkg://{PUBLISHER}/{INCORP_NAME}@{version},5.11
r#"set name=pkg.fmri value=pkg://{PUBLISHER}/{INCORP_NAME}@{version}-{branch},5.11
set name=pkg.summary value="Incorporation to constrain software delivered in Omicron Release V{version} images"
set name=info.classification value="org.opensolaris.category.2008:Meta Packages/Incorporations"
set name=variant.opensolaris.zone value=global value=nonglobal
Expand Down
Loading