Make versioning work and tag 1.0.0 release

facebookexperimental · Oct 13, 2020 · b87c409 · b87c409
1 parent 71729c0
commit b87c409
Show file tree

Hide file tree

Showing 11 changed files with 579 additions and 578 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rd-agent-intf/Cargo.toml b/rd-agent-intf/Cargo.toml
@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates
 [package]
 name = "rd-agent-intf"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Tejun Heo <[email protected]>"]
 edition = "2018"
 

diff --git a/rd-agent-intf/src/args.rs b/rd-agent-intf/src/args.rs
@@ -89,8 +89,8 @@ impl JsonSave for Args {}
 impl JsonArgs for Args {
     fn match_cmdline() -> clap::ArgMatches<'static> {
         clap::App::new("rd-agent")
-            .version("0.1")
-            .author("Tejun Heo <[email protected]>")
+            .version(env!("CARGO_PKG_VERSION"))
+            .author(env!("CARGO_PKG_AUTHORS"))
             .about(HELP_BODY)
             .args_from_usage(&ARGS_STR)
             .setting(clap::AppSettings::UnifiedHelpMessage)

diff --git a/rd-agent/Cargo.toml b/rd-agent/Cargo.toml
@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates
 [package]
 name = "rd-agent"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Tejun Heo <[email protected]>"]
 edition = "2018"
 

diff --git a/rd-hashd-intf/Cargo.toml b/rd-hashd-intf/Cargo.toml
@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates
 [package]
 name = "rd-hashd-intf"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Tejun Heo <[email protected]>"]
 edition = "2018"
 

diff --git a/rd-hashd-intf/src/args.rs b/rd-hashd-intf/src/args.rs
@@ -213,8 +213,8 @@ impl JsonSave for Args {
 impl JsonArgs for Args {
     fn match_cmdline() -> ArgMatches<'static> {
         App::new("rd-hashd")
-            .version("0.1")
-            .author("Tejun Heo <[email protected]>")
+            .version(env!("CARGO_PKG_VERSION"))
+            .author(env!("CARGO_PKG_AUTHORS"))
             .about(HELP_BODY)
             .args_from_usage(&ARGS_STR)
             .setting(AppSettings::UnifiedHelpMessage)

diff --git a/rd-hashd/Cargo.toml b/rd-hashd/Cargo.toml
@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates
 [package]
 name = "rd-hashd"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Tejun Heo <[email protected]>"]
 edition = "2018"
 

diff --git a/resctl-demo/Cargo.toml b/resctl-demo/Cargo.toml
@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates
 [package]
 name = "resctl-demo"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Tejun Heo <[email protected]>"]
 edition = "2018"
 

diff --git a/resctl-demo/src/main.rs b/resctl-demo/src/main.rs
@@ -483,8 +483,8 @@ fn touch_units() {
 
 fn main() {
     let matches = clap::App::new("resctl-demo")
-        .version("0.1")
-        .author("Tejun Heo <[email protected]>")
+        .version(env!("CARGO_PKG_VERSION"))
+        .author(env!("CARGO_PKG_AUTHORS"))
         .about("Facebook Resource Control Demo")
         .args_from_usage(&ARGS_STR)
         .setting(clap::AppSettings::UnifiedHelpMessage)

diff --git a/resctl-demo/src/status.rs b/resctl-demo/src/status.rs
@@ -406,7 +406,10 @@ pub fn status_layout_factory() -> impl View {
             .child(TextView::new("").with_name("status-workload-A"))
             .child(TextView::new("").with_name("status-workload-B")),
     )
-    .title("Facebook Resource Control Demo - 'q': quit")
+    .title(format!(
+        "Facebook Resource Control Demo v{} - 'q': quit",
+        env!("CARGO_PKG_VERSION")
+    ))
     .resized(
         SizeConstraint::Fixed(layout.status.x),
         SizeConstraint::Fixed(layout.status.y),

diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "util"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Tejun Heo <[email protected]>"]
 edition = "2018"