build: Handle detached HEAD and shadow.rs in target/

.github/workflows/rust.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - uses: actions/cache@v3
@@ -26,9 +26,15 @@ jobs:
       run: |
         fixtures/start_fileserver.sh &
 
+    - name: Remove files for a build with correct version info
+      run: |
+        find target/ -name 'shadow*' -exec rm -r {} + || true
+        find target/ -name 'tsumugu' -delete || true
     - name: Test & Compile
       run: |
         mkdir -p ~/.cargo/{git,registry}
+        # Fix git permission issue with Docker and shadow-rs
+        sudo chown -R root .
         docker run --rm -t \
             --mount type=bind,source=${{ github.workspace }},target=/volume \
             --mount type=bind,source=$HOME/.cargo/registry,target=/root/.cargo/registry \
@@ -44,7 +50,9 @@ jobs:
             clux/muslrust:stable \
             cargo build --release
         sudo chown -R runner ~/.cargo/
-        sudo chown -R runner target/
+        sudo chown -R runner .
+        # show version info
+        RUST_LOG=debug target/x86_64-unknown-linux-musl/release/tsumugu --version
 
     - name: Deploy - Create and Upload Release
       if: startsWith(github.ref, 'refs/tags/')

Cargo.toml

@@ -26,10 +26,10 @@ humansize = "2.1.3"
 console = { version = "0.15", default-features = false, features = ["ansi-parsing"] }
 apt-parser = "1.0.0"
 flate2 = "1.0.28"
-shadow-rs = "0.26.1"
+shadow-rs = "0.32.0"
 
 [build-dependencies]
-shadow-rs = "0.26.1"
+shadow-rs = "0.32.0"
 
 [dev-dependencies]
 test-log = { version = "0.2.14", default-features = false, features = ["trace"] }

src/main.rs

@@ -22,10 +22,18 @@ mod extensions;
 
 use crate::regex_process::ExpandedRegex;
 
+fn get_version() -> &'static str {
+    let short_commit = build::SHORT_COMMIT;
+    if short_commit.len() == 0 {
+        return build::TAG;
+    }
+    return short_commit;
+}
+
 #[derive(Parser, Debug)]
 #[command(about)]
 #[command(propagate_version = true)]
-#[command(version = build::SHORT_COMMIT)]
+#[command(version = get_version())]
 struct Cli {
     #[command(subcommand)]
     command: Commands,