version: show echoircd-<major> (5) in 002/004/351 and enrich RPL_VERSION with build/toolchain provenance

This commit is contained in:
Jean Chevronnet 2026-08-23 01:24:45 +00:00
parent 5c286a94cb
commit 42fe82556b
No known key found for this signature in database
GPG key ID: 439666D63A9477E4
6 changed files with 71 additions and 9 deletions

View file

@ -28,6 +28,19 @@ use crate::xline::XLine;
use crate::Uid;
pub const VERSION: &str = env!("CARGO_PKG_VERSION");
/// The wire version token, major only (e.g. `echoircd-5`), for 002/004/351.
pub const RELEASE: &str = env!("CARGO_PKG_VERSION_MAJOR");
// Build provenance, captured by build.rs.
pub const GIT_HASH: &str = env!("ECHOIRCD_GIT_HASH");
pub const GIT_DIRTY: &str = env!("ECHOIRCD_GIT_DIRTY");
pub const COMMIT_DATE: &str = env!("ECHOIRCD_COMMIT_DATE");
pub const RUSTC: &str = env!("ECHOIRCD_RUSTC");
pub const TARGET: &str = env!("ECHOIRCD_TARGET");
/// The `RPL_VERSION` (351) comment: full version, build, and toolchain.
pub fn version_comment() -> String {
format!("echoircd {VERSION} · {GIT_HASH}{GIT_DIRTY} · built {COMMIT_DATE} · rustc {RUSTC} · {TARGET}")
}
/// Background timer cadence + idle/ping timeouts, in seconds.
pub const TICK_SECS: u64 = 15;
@ -1507,6 +1520,14 @@ mod tests {
use crate::users::{valid_nick, User, UserFlags};
use std::sync::mpsc::{self, Receiver};
#[test]
fn version_token_and_comment() {
assert_eq!(RELEASE, "5");
let c = version_comment();
assert!(c.starts_with("echoircd 5.0.0 \u{b7}"), "unexpected: {c}");
assert!(c.contains("rustc ") && c.contains("built "));
}
/// Insert a registered user with an output channel readable in the test.
fn add_user(s: &mut Server, uid: Uid, nick: &str) -> Receiver<String> {
let (tx, rx) = mpsc::channel();