Versions on the hub: About page, /api/v1/version, footer, oh --version e9bfea8e26db

//! The build's identity, for the version it reports: `OXY_BUILD` when a release or

//! an install sets it (from `oxy describe`), else the heads a Flow job is

//! building, else "local build".

fn main() {

    println!("cargo:rerun-if-env-changed=OXY_BUILD");

    println!("cargo:rerun-if-env-changed=FLOW_HEADS");

    let build = std::env::var("OXY_BUILD")

        .ok()

        .map(|b| b.trim().to_string())

        .filter(|b| !b.is_empty())

        .or_else(|| {

            std::env::var("FLOW_HEADS")

                .ok()

                .and_then(|h| h.split('+').next().map(|x| format!("flow #{}", &x[..12.min(x.len())])))

                .filter(|b| b.len() > "flow #".len())

        })

        .unwrap_or_else(|| "local build".into());

    println!("cargo:rustc-env=OXY_BUILD_ID={build}");

    println!("cargo:rustc-env=OXY_VERSION_LONG={} ({build})", std::env::var("CARGO_PKG_VERSION").unwrap());

}

//! The build's identity, for the version it reports: `OXY_BUILD` when a release or

//! an install sets it (from `oxy describe`), else the heads a Flow job is

//! building, else "local build".

fn main() {

    println!("cargo:rerun-if-env-changed=OXY_BUILD");

    println!("cargo:rerun-if-env-changed=FLOW_HEADS");

    let build = std::env::var("OXY_BUILD")

        .ok()

        .map(|b| b.trim().to_string())

        .filter(|b| !b.is_empty())

        .or_else(|| {

            std::env::var("FLOW_HEADS")

                .ok()

                .and_then(|h| h.split('+').next().map(|x| format!("flow #{}", &x[..12.min(x.len())])))

                .filter(|b| b.len() > "flow #".len())

        })

        .unwrap_or_else(|| "local build".into());

    println!("cargo:rustc-env=OXY_BUILD_ID={build}");

    println!("cargo:rustc-env=OXY_VERSION_LONG={} ({build})", std::env::var("CARGO_PKG_VERSION").unwrap());

}

{% extends "base.html" %}

{% block title %}About{% endblock %}

{% block content %}

<div class="head"><h1>About <small>{{ shell.site }}</small></h1></div>

<section class="panel">

  <h2>This hub</h2>

  <dl class="facts">

    <dt>OxygenHub</dt><dd><strong>{{ shell.version }}</strong> <span class="mute">({{ shell.build }})</span></dd>

    <dt>Built on</dt><dd>oxy-core {{ oxy_core }} · flow-core {{ flow_core }}</dd>

  </dl>

  <p class="small mute">The build names the state it was built from (<code>oxy describe</code>), the heads of a Flow build, or says "local build". The same is at <a href="/api/v1/version">/api/v1/version</a>; <code>oxy --version</code>, <code>oh --version</code> and <code>flow --version</code> report theirs, and the VS Code extensions show theirs in the Extensions view.</p>

</section>

{% if !runners.is_empty() %}

<section class="panel">

  <h2>Runners</h2>

  <div class="table"><table>

  <tr><th>Runner</th><th>Status</th><th>flow</th><th>Machine</th></tr>

  {% for r in runners %}<tr><td><a href="/admin/runners/{{ r.id }}">{{ r.name }}</a></td><td><span class="runner-status st-{{ r.status() }}">{{ r.status() }}</span></td><td>{% if r.version.is_empty() %}<span class="mute">not reported</span>{% else %}{{ r.version }}{% endif %}</td><td class="small">{{ r.arch }} {{ r.os }}</td></tr>{% endfor %}

  </table></div>

</section>

{% endif %}

{% endblock %}

	B="$$(oxy --plain describe 2>/dev/null)"; ssh claude@earth "source ~/.cargo/env && cd src/oxygenhub && OXY_BUILD='$$B' cargo build --release && sudo install -m 0755 target/release/oxygenhub /usr/local/bin/oxygenhub && sudo systemctl restart oxygenhub && systemctl is-active oxygenhub"

/// `GET /api/v1/version`: the hub's version and build, and the Oxygen and

/// OxygenFlow library versions it is built on.

async fn version() -> Json<serde_json::Value> {

    Json(crate::web::home::versions())

}

        .route("/version", get(version))

        "build": env!("OXY_BUILD_ID"),

}

/// What this hub is built from (hub spec §15): its version and build, and

/// the versions of the Oxygen and OxygenFlow libraries it links.

pub fn versions() -> serde_json::Value {

    serde_json::json!({

        "oxygenhub": { "version": env!("CARGO_PKG_VERSION"), "build": env!("OXY_BUILD_ID") },

        "oxy_core": oxy_core::VERSION,

        "flow_core": flow_core::VERSION,

    })

}

#[derive(askama::Template)]

#[template(path = "about.html")]

pub struct AboutPage {

    shell: Shell,

    oxy_core: &'static str,

    flow_core: &'static str,

    /// Runners and the versions they report, for administrators.

    runners: Vec<crate::db::runners::Runner>,

}

/// `GET /about`: the hub's version and what it is built on; runners too, for

/// administrators.

pub async fn about(State(app): State<Shared>, viewer: Viewer) -> Result<Page<AboutPage>, Error> {

    let shell = Shell::new(&app, "/about", &viewer);

    let runners = if viewer.is_admin() { crate::db::runners::list(&app.db).await.unwrap_or_default() } else { vec![] };

    Ok(Page(AboutPage { shell, oxy_core: oxy_core::VERSION, flow_core: flow_core::VERSION, runners }))

pub mod home;

        .route("/about", get(home::about))

    /// What was built: `oxy describe` at deploy, a Flow build's heads, or "local build".

    pub build: &'static str,

            build: env!("OXY_BUILD_ID"),

            build: "",

/// What the hub is: its version and build, and the libraries it is built on,

/// on /about, in the API and in /health (hub spec §15).

#[tokio::test(flavor = "multi_thread")]

async fn the_hub_says_what_version_it_is() {

    let h = hub().await;

    let app = &h.app;

    let (st, v) = api(app, "GET", "/api/v1/version", None, None).await;

    assert_eq!(st, StatusCode::OK);

    assert_eq!(v["oxygenhub"]["version"], env!("CARGO_PKG_VERSION"));

    assert!(v["oxygenhub"]["build"].as_str().is_some_and(|b| !b.is_empty()), "{v}");

    assert!(v["oxy_core"].as_str().is_some() && v["flow_core"].as_str().is_some());

    let health = call(app, "GET", "/health", None, None, None, None).await.body;

    assert!(health.contains("\"build\""), "{health}");

    let about = call(app, "GET", "/about", None, None, None, None).await.body;

    assert!(about.contains(&format!("<strong>{}</strong>", env!("CARGO_PKG_VERSION"))) && about.contains("oxy-core"), "{about}");

    assert!(about.contains("href=\"/about\""), "the footer links here");

}

#[command(name = "oh", version = env!("OXY_VERSION_LONG"), about = "OxygenHub from the command line: issues, proposals, Flow runs and releases")]

  <a class="dim" href="/about" title="OxygenHub {{ shell.version }} ({{ shell.build }})">v{{ shell.version }}</a>

/* Room for the scroll bar always, so nothing shifts when it comes and goes. */

html { background: var(--bg); scrollbar-gutter: stable; }

/* The repository bar is as wide as its contents need: at least the page

   column (so it lines up with it), wider for a long name, and it wraps only

   when the window itself is too narrow. */

.tabs-in { width: fit-content; min-width: min(1180px, 100%); max-width: 100%; box-sizing: border-box; margin: 0 auto; padding: 0 22px; display: flex; align-items: center; gap: 2px; flex-wrap: wrap; }

.tabs .crumb { white-space: nowrap; }