Update version.

Do not hardcore a SHA.
LukeMathWalker · Jan 16, 2024 · a7fcf04 · a7fcf04
1 parent f3c64d4
commit a7fcf04
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 27 deletions.
diff --git a/libs/Cargo.lock b/libs/Cargo.lock
diff --git a/libs/pavex/Cargo.toml b/libs/pavex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavex"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 repository = "https://github.com/LukeMathWalker/pavex"
 

diff --git a/libs/pavex_bp_schema/Cargo.toml b/libs/pavex_bp_schema/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavex_bp_schema"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [dependencies]

diff --git a/libs/pavex_cli/Cargo.toml b/libs/pavex_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavex_cli"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [[bin]]

diff --git a/libs/pavex_cli/src/env.rs b/libs/pavex_cli/src/env.rs
@@ -21,3 +21,13 @@ pub fn tty_width() -> Option<usize> {
         .ok()
         .and_then(|s| s.parse().ok())
 }
+
+/// The SHA of the commit that `pavex_cli` was built from.
+pub const fn commit_sha() -> &'static str {
+    env!("VERGEN_GIT_SHA")
+}
+
+/// The version of `pavex_cli` that is being used.
+pub const fn version() -> &'static str {
+    env!("CARGO_PKG_VERSION")
+}
diff --git a/libs/pavex_cli/src/main.rs b/libs/pavex_cli/src/main.rs
@@ -36,7 +36,12 @@ struct Cli {
 }
 
 // Same structure used by `cargo --version`.
-static VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", env!("VERGEN_GIT_SHA"), ")");
+static VERSION: &str = concat!(
+    pavex_cli::env::version(),
+    " (",
+    pavex_cli::env::commit_sha(),
+    ")"
+);
 
 #[derive(Copy, Clone, Debug)]
 enum Color {

diff --git a/libs/pavex_cli/src/pavexc/mod.rs b/libs/pavex_cli/src/pavexc/mod.rs
@@ -40,7 +40,7 @@ pub fn get_or_install_from_version(
     locator: &PavexLocator,
     version: &Version,
 ) -> Result<PathBuf, anyhow::Error> {
-    let revision_sha = "b32592e21e753529ae7abd14c1829fa99bca150b";
+    let revision_sha = crate::env::commit_sha();
     let pavexc_path = locator
         .toolchains()
         .git()

diff --git a/libs/pavex_cli/src/state.rs b/libs/pavex_cli/src/state.rs
@@ -1,3 +1,4 @@
+use crate::env::version;
 use crate::locator::PavexLocator;
 use anyhow::Context;
 use cargo_like_utils::flock::{FileLock, Filesystem};
@@ -37,7 +38,7 @@ impl State {
             Some(current_state) => Ok(current_state.toolchain),
             None => {
                 // We default to the toolchain that matches the current version of the CLI.
-                let cli_version = semver::Version::parse(env!("CARGO_PKG_VERSION"))
+                let cli_version = semver::Version::parse(version())
                     .context("Failed to parse the current version of the CLI.")?;
                 Ok(cli_version)
             }

diff --git a/libs/pavex_cli_client/Cargo.toml b/libs/pavex_cli_client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavex_cli_client"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [dependencies]

diff --git a/libs/pavex_macros/Cargo.toml b/libs/pavex_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavex_macros"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [lib]

diff --git a/libs/pavex_miette/Cargo.toml b/libs/pavex_miette/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavex_miette"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [dependencies]

diff --git a/libs/pavex_reflection/Cargo.toml b/libs/pavex_reflection/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavex_reflection"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [dependencies]

diff --git a/libs/pavex_test_runner/Cargo.toml b/libs/pavex_test_runner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavex_test_runner"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [package.metadata.dist]

diff --git a/libs/pavexc/Cargo.toml b/libs/pavexc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavexc"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [build-dependencies]

diff --git a/libs/pavexc_cli/Cargo.toml b/libs/pavexc_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavexc_cli"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [[bin]]

diff --git a/libs/pavexc_cli_client/Cargo.toml b/libs/pavexc_cli_client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pavexc_cli_client"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [dependencies]

diff --git a/libs/persist_if_changed/Cargo.toml b/libs/persist_if_changed/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "persist_if_changed"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [dependencies]