Skip to content

Commit

Permalink
Merge pull request containers#418 from bcrochet/version-simple
Browse files Browse the repository at this point in the history
feat(build): Add extra version information
  • Loading branch information
cgwalters authored Mar 23, 2024
2 parents c75fc58 + 1b12b64 commit 60552ee
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 5 deletions.
4 changes: 2 additions & 2 deletions 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 cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bootc"
version = "0.1.0"
version = "0.1.9"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/cgwalters/bootc"
Expand Down
5 changes: 3 additions & 2 deletions lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ license = "MIT OR Apache-2.0"
name = "bootc-lib"
readme = "README.md"
repository = "https://github.com/cgwalters/bootc"
version = "0.1.0"
version = "0.1.9"
rust-version = "1.64.0"
build = "build.rs"

include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"]

Expand All @@ -17,7 +18,7 @@ anyhow = "1.0"
camino = { version = "1.1.6", features = ["serde1"] }
ostree-ext = { version = "0.13.3" }
chrono = { version = "0.4.35", features = ["serde"] }
clap = { version= "4.5", features = ["derive"] }
clap = { version= "4.5", features = ["derive","cargo"] }
clap_mangen = { version = "0.2", optional = true }
cap-std-ext = "4"
hex = "^0.4.3"
Expand Down
22 changes: 22 additions & 0 deletions lib/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// build.rs

use std::env;
use std::fs;
use std::path::Path;

fn main() {
let out_dir = env::var_os("OUT_DIR").unwrap();
let dest_path = Path::new(&out_dir).join("version.rs");
fs::write(
&dest_path,
"
#[allow(dead_code)]
#[allow(clippy::all)]
use clap::crate_version;
#[doc=r#\"Version string\"#]
pub const CLAP_LONG_VERSION: &str = crate_version!();
",
)
.unwrap();
println!("cargo:rerun-if-changed=build.rs");
}
3 changes: 3 additions & 0 deletions lib/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ use crate::spec::Host;
use crate::spec::ImageReference;
use crate::utils::sigpolicy_from_opts;

include!(concat!(env!("OUT_DIR"), "/version.rs"));

/// Perform an upgrade operation
#[derive(Debug, Parser, PartialEq, Eq)]
pub(crate) struct UpgradeOpts {
Expand Down Expand Up @@ -171,6 +173,7 @@ pub(crate) enum TestingOpts {
#[derive(Debug, Parser, PartialEq, Eq)]
#[clap(name = "bootc")]
#[clap(rename_all = "kebab-case")]
#[clap(version,long_version=CLAP_LONG_VERSION)]
#[allow(clippy::large_enum_variant)]
pub(crate) enum Opt {
/// Download and queue an updated container image to apply.
Expand Down

0 comments on commit 60552ee

Please sign in to comment.