beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-21 10:30:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix long version on nix and ci

Browse source
This commit is contained in:
Clément DOUIN 2024-11-20 15:00:17 +01:00
parent 396a91a322
commit 36f3690cba
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
4 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
build.rs
View file

@ -3,36 +3,18 @@ use std::env;
use git2::Repository; use git2::Repository;
fn main() { fn main() {
let repo = Repository::open(".").expect("should open git repository"); if let Ok(repo) = Repository::open(".") {
let head = repo.head().expect("should get HEAD"); let head = repo.head().expect("should get git HEAD");
let branch = head.shorthand().expect("should get branch name"); let commit = head.peel_to_commit().expect("should get git HEAD commit");
let commit = head.peel_to_commit().expect("should get HEAD commit"); println!("cargo::rustc-env=GIT_REV={}", commit.id());
let rev = commit.id().to_string(); }
let version = env!("CARGO_PKG_VERSION");
let os = env::var("CARGO_CFG_TARGET_OS").expect("should get CARGO_CFG_TARGET_OS"); let os = env::var("CARGO_CFG_TARGET_OS").expect("should get CARGO_CFG_TARGET_OS");
println!("cargo::rustc-env=TARGET_OS={os}");
let env = env::var("CARGO_CFG_TARGET_ENV").expect("should get CARGO_CFG_TARGET_ENV"); let env = env::var("CARGO_CFG_TARGET_ENV").expect("should get CARGO_CFG_TARGET_ENV");
println!("cargo::rustc-env=TARGET_ENV={env}");
let arch = env::var("CARGO_CFG_TARGET_ARCH").expect("should get CARGO_CFG_TARGET_ARCH"); let arch = env::var("CARGO_CFG_TARGET_ARCH").expect("should get CARGO_CFG_TARGET_ARCH");
println!("cargo::rustc-env=TARGET_ARCH={arch}");
let long_version = [
version,
&os,
&env,
&arch,
"git branch",
&branch,
"rev",
&rev,
]
.into_iter()
.filter(|s| !s.trim().is_empty())
.fold(String::new(), |mut version, section| {
if !version.is_empty() {
version.push(' ')
}
version.push_str(section);
version
});
println!("cargo::rustc-env=HIMALAYA_LONG_VERSION={long_version}");
} }

6
flake.lock
View file

@ -79,11 +79,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730137625, "lastModified": 1731797254,
"narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -134,6 +134,7 @@
nativeBuildInputs = with pkgs; [ pkg-config ]; nativeBuildInputs = with pkgs; [ pkg-config ];
CARGO_BUILD_TARGET = targetConfig.rustTarget; CARGO_BUILD_TARGET = targetConfig.rustTarget;
CARGO_BUILD_RUSTFLAGS = [ "-Ctarget-feature=+crt-static" ]; CARGO_BUILD_RUSTFLAGS = [ "-Ctarget-feature=+crt-static" ];
GIT_REV = self.rev or self.dirtyRev or "dirty";
postInstall = '' postInstall = ''
export WINEPREFIX="$(mktemp -d)" export WINEPREFIX="$(mktemp -d)"

19
src/cli.rs
View file

@ -24,7 +24,9 @@ use crate::{
}; };
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
#[command(name = "himalaya", author, version, about)] #[command(name = env!("CARGO_PKG_NAME"))]
#[command(author, version, about)]
#[command(long_version = Cli::LONG_VERSION)]
#[command(propagate_version = true, infer_subcommands = true)] #[command(propagate_version = true, infer_subcommands = true)]
pub struct Cli { pub struct Cli {
#[command(subcommand)] #[command(subcommand)]
@ -72,6 +74,21 @@ pub struct Cli {
pub trace: bool, pub trace: bool,
} }
impl Cli {
pub const LONG_VERSION: &'static str = concat!(
"v",
env!("CARGO_PKG_VERSION"),
" on ",
env!("TARGET_OS"),
" ",
env!("TARGET_ENV"),
" ",
env!("TARGET_ARCH"),
", git rev ",
env!("GIT_REV"),
);
}
#[derive(Subcommand, Debug)] #[derive(Subcommand, Debug)]
pub enum HimalayaCommand { pub enum HimalayaCommand {
#[command(subcommand)] #[command(subcommand)]