feat: embed version from git

.github/workflows/ci.yml

@@ -6,11 +6,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # needed to embed version information
       - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Install deps
         run: sudo apt-get update -q && sudo apt-get install -y libnotmuch-dev
-      - run: cargo build
+      - run: cargo build --release
       - run: cargo test --all-features
+      - uses: actions/upload-artifact@v4
+        with:
+          name: notmuch-mailmover
+          path: |
+            target/release/notmuch-mailmover
 
   format:
     name: cargo fmt
@@ -33,21 +40,6 @@ jobs:
           components: clippy
       - run: cargo clippy
 
-  generate:
-    name: generate
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-      - name: Install deps
-        run: sudo apt-get update -q && sudo apt-get install -y libnotmuch-dev
-      - name: Generate files
-        run: cargo build
-        env:
-          GEN_ARTIFACTS: share
-      - name: Check if files have changed
-        run: git diff --exit-code
-
   coverage:
     runs-on: ubuntu-latest
     env:

Cargo.toml

@@ -1,12 +1,25 @@
 [package]
 name = "notmuch-mailmover"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Michael Adler <[email protected]>"]
 description = "Move notmuch tagged mails into Maildir folders"
 homepage = "https://github.com/michaeladler/notmuch-mailmover"
 license = "Apache-2.0"
 edition = "2021"
 
+[lib]
+name = "nm_mailmover"
+path = "src/lib/mod.rs"
+
+[[bin]]
+name = "notmuch-mailmover"
+path = "src/main.rs"
+
+[profile.release]
+lto = true
+panic = "abort"
+codegen-units = 1
+
 [dependencies]
 uuid = { version = "1.10.0", features = ["v4"] }
 anyhow = "1.0.82"
@@ -18,16 +31,13 @@ serde_yaml = "0.9.34"
 directories = "5.0.1"
 shellexpand = "3.0.0"
 clap = { version = "4.5.13", features = [ "derive", "cargo" ] }
-
-[dev-dependencies]
-regex = "1.10.6"
+git-version = "0.3.9"
 
 [build-dependencies]
 clap = { version = "4.5.13", features = [ "derive", "cargo" ] }
 clap_complete = "4.5.13"
 clap_mangen = "0.2.23"
+git-version = "0.3.9"
 
-[profile.release]
-lto = true
-panic = "abort"
-codegen-units = 1
+[dev-dependencies]
+regex = "1.10.6"

build.rs

@@ -1,5 +1,4 @@
 use std::{
-    env,
     fs::{create_dir_all, File},
     path::Path,
 };
@@ -8,22 +7,20 @@ use clap::CommandFactory;
 use clap_complete::{generate_to, Shell};
 use clap_mangen::Man;
 
-include!("src/cli.rs");
+include!("src/lib/cli.rs");
 
 fn main() {
-    println!("cargo:rerun-if-env-changed=GEN_ARTIFACTS");
+    println!("cargo::rerun-if-changed=src/lib/cli.rs");
 
-    if let Some(dir) = env::var_os("GEN_ARTIFACTS") {
-        let out = &Path::new(&dir);
-        create_dir_all(out).unwrap();
-        let cmd = &mut Cli::command();
+    let out = &Path::new("share");
+    create_dir_all(out).unwrap();
+    let cmd = &mut Cli::command();
 
-        Man::new(cmd.clone())
-            .render(&mut File::create(out.join("notmuch-mailmover.1")).unwrap())
-            .unwrap();
+    Man::new(cmd.clone())
+        .render(&mut File::create(out.join("notmuch-mailmover.1")).unwrap())
+        .unwrap();
 
-        for shell in Shell::value_variants() {
-            generate_to(*shell, cmd, "notmuch-mailmover", out).unwrap();
-        }
+    for shell in Shell::value_variants() {
+        generate_to(*shell, cmd, "notmuch-mailmover", out).unwrap();
     }
 }