Merge pull request #236 from xrelkd/feat/version

Add build-time information
xrelkd · Dec 31, 2023 · 3083c22 · 3083c22
2 parents 963385d + de8adee
commit 3083c22
Show file tree

Hide file tree

Showing 18 changed files with 276 additions and 4 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -2,6 +2,8 @@ name: Release
 
 on:
   push:
+    branches:
+      - release/*
     tags:
       - "v*"
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clipcat-menu/Cargo.toml b/clipcat-menu/Cargo.toml
@@ -25,6 +25,7 @@ tokio = { version = "1", features = ["rt-multi-thread", "sync"] }
 clap          = { version = "4", features = ["derive", "env"] }
 clap_complete = "4"
 http          = "1"
+shadow-rs     = "0.26"
 skim          = "0.10"
 snafu         = "0.8"
 
@@ -33,5 +34,8 @@ clipcat-cli             = { path = "../crates/cli" }
 clipcat-client          = { path = "../crates/client" }
 clipcat-external-editor = { path = "../crates/external-editor" }
 
+[build-dependencies]
+shadow-rs = "0.26"
+
 [lints]
 workspace = true
diff --git a/clipcat-menu/build.rs b/clipcat-menu/build.rs
@@ -0,0 +1 @@
+fn main() -> shadow_rs::SdResult<()> { shadow_rs::new() }
diff --git a/clipcat-menu/src/cli/mod.rs b/clipcat-menu/src/cli/mod.rs
@@ -13,12 +13,20 @@ use crate::{
     config::Config,
     error::{self, Error},
     finder::{FinderRunner, FinderType},
+    shadow,
 };
 
 const PREVIEW_LENGTH: usize = 80;
 
 #[derive(Parser)]
-#[command(name = clipcat_base::MENU_PROGRAM_NAME, author, version, about, long_about = None)]
+#[command(
+    name = clipcat_base::MENU_PROGRAM_NAME,
+    author,
+    version,
+    long_version = shadow::CLAP_LONG_VERSION,
+    about,
+    long_about = None
+)]
 pub struct Cli {
     #[command(subcommand)]
     commands: Option<Commands>,

diff --git a/clipcat-menu/src/main.rs b/clipcat-menu/src/main.rs
@@ -2,6 +2,13 @@ mod cli;
 mod config;
 mod error;
 mod finder;
+mod shadow {
+    #![allow(clippy::needless_raw_string_hashes)]
+    use shadow_rs::shadow;
+    shadow!(build);
+
+    pub use self::build::*;
+}
 
 use self::cli::Cli;
 

diff --git a/clipcat-notify/Cargo.toml b/clipcat-notify/Cargo.toml
@@ -20,11 +20,15 @@ tokio = { version = "1", features = ["rt-multi-thread", "sync"] }
 clap          = { version = "4", features = ["derive", "env"] }
 clap_complete = "4"
 mime          = "0.3"
+shadow-rs     = "0.26"
 snafu         = "0.8"
 time          = { version = "0.3", features = ["local-offset", "serde"] }
 
 clipcat-base   = { path = "../crates/base" }
 clipcat-server = { path = "../crates/server" }
 
+[build-dependencies]
+shadow-rs = "0.26"
+
 [lints]
 workspace = true
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ name: Release @@
     on:
       push:
+        branches:
+          - release/*
         tags:
           - "v*"
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fn main() -> shadow_rs::SdResult<()> { shadow_rs::new() }