properly set crate version during build

easybill · Jan 25, 2024 · 1ffd470 · 1ffd470
1 parent e3bc669
commit 1ffd470
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,15 +75,19 @@ jobs:
           toolchain: stable
           targets: ${{ matrix.platform.target }}
 
+      - name: Install Cargo Edit
+        run: cargo install cargo-edit
+
+      - name: Set Crate Version
+        run: cargo set-version ${{ steps.get_release_version.outputs.version }}
+
       - name: Initialize Rust caching
         uses: Swatinem/rust-cache@v2
         with:
           key: ${{ matrix.platform.target }}
 
       - name: Compile Binary
         uses: clechasseur/rs-cargo@v2
-        env:
-          BUILD_VERSION: ${{ steps.get_release_version.outputs.version }}
         with:
           command: build
           use-cross: true

diff --git a/openmetrics_udpserver/src/main.rs b/openmetrics_udpserver/src/main.rs
@@ -23,7 +23,7 @@ pub static METRIC_COUNTER_REQUESTS: Lazy<Counter<u64>> = Lazy::new(Default::defa
 pub static METRIC_COUNTER_ERRORS: Lazy<Counter<u64>> = Lazy::new(Default::default);
 pub static METRIC_COUNTER_UDP_PACKETS: Lazy<Counter<u64>> = Lazy::new(Default::default);
 
-const VERSION: Option<&str> = option_env!("BUILD_VERSION");
+const VERSION: Option<&str> = option_env!("CARGO_PKG_VERSION");
 
 #[tokio::main]
 async fn main() -> anyhow::Result<(), anyhow::Error> {