Merge pull request #1764 from kinnison/kinnison/update-git-testament

nrc · web-flow · commit 4017736d3036 · 2019-04-15T09:00:08.000+12:00
Version: Update git-testament to 0.1.4 and trust `stable`
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,7 +47,7 @@ wait-timeout = "0.2"
 walkdir = "2"
 xz2 = "0.1.3"
 openssl = { version = "0.10", optional = true }
-git-testament = "0.1"
+git-testament = "0.1.4"
 lazy_static = "1"
 
 [target."cfg(windows)".dependencies]
diff --git a/src/cli/common.rs b/src/cli/common.rs
@@ -406,7 +406,10 @@ git_testament!(TESTAMENT);
 
 pub fn version() -> &'static str {
     lazy_static! {
-        static ref RENDERED: String = render_testament!(TESTAMENT);
+        // Because we trust our `stable` branch given the careful release
+        // process, we mark it trusted here so that our version numbers look
+        // right when built from CI before the tag is pushed
+        static ref RENDERED: String = render_testament!(TESTAMENT, "stable");
     }
     &RENDERED
 }

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,10 @@ git_testament!(TESTAMENT);`
`406`	`406`
`407`	`407`	`pub fn version() -> &'static str {`
`408`	`408`	`lazy_static! {`
`409`		`- static ref RENDERED: String = render_testament!(TESTAMENT);`
	`409`	+ // Because we trust our `stable` branch given the careful release
	`410`	`+ // process, we mark it trusted here so that our version numbers look`
	`411`	`+ // right when built from CI before the tag is pushed`
	`412`	`+ static ref RENDERED: String = render_testament!(TESTAMENT, "stable");`
`410`	`413`	`}`
`411`	`414`	`&RENDERED`
`412`	`415`	`}`