Fixed version string

.gitea/workflows/build.yaml

@@ -17,13 +17,14 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
-      - name: Set timestamp and release version
+      - name: Set git based environment variables
         run: |
           echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV
-          git fetch --prune --unshallow --tags --force
+          echo "RELEASE_VERSION=$(git describe --always --dirty='--modified)" >> $GITHUB_ENV
-          echo "RELEASE_VERSION=$(git describe --always --dirty='--modified')" >> $GITHUB_ENV
-          cat $GITHUB_ENV
 
       - name: Login to registry
         uses: docker/login-action@v3

Dockerfile

@@ -15,7 +15,7 @@ RUN cargo chef cook --release --recipe-path recipe.json
 
 COPY . .
 ARG RELEASE_VERSION
-ENV RELEASE_VERSION=${RELEASE_VERSION}
+ENV RELEASE_VERSION ${RELEASE_VERSION}
 # HACK: Enable the use of features on stable
 ENV RUSTC_BOOTSTRAP=1
 RUN cargo auditable build --release

src/lib.rs

@@ -5,7 +5,10 @@ mod io;
 pub mod ldap;
 pub mod ssh;
 pub mod tunnel;
-mod version;
 pub mod web;
 
-pub use version::VERSION;
+pub fn get_version() -> &'static str {
+    std::option_env!("RELEASE_VERSION")
+        .filter(|version| !version.is_empty())
+        .unwrap_or(git_version::git_version!())
+}

src/main.rs

@@ -6,7 +6,7 @@ use dotenvy::dotenv;
 use hyper::server::conn::http1::{self};
 use hyper_util::rt::TokioIo;
 use rand::rngs::OsRng;
-use siranga::VERSION;
+use siranga::get_version;
 use siranga::ldap::Ldap;
 use siranga::ssh::Server;
 use siranga::tunnel::Registry;
@@ -38,7 +38,7 @@ async fn main() -> color_eyre::Result<()> {
             .init();
     }
 
-    info!(version = VERSION, "Starting",);
+    info!(version = get_version(), "Starting",);
 
     let key = if let Ok(path) = std::env::var("PRIVATE_KEY_FILE") {
         russh::keys::PrivateKey::read_openssh_file(Path::new(&path))

src/ssh/handler.rs

@@ -2,6 +2,7 @@ use std::cmp::min;
 use std::iter::once;
 
 use clap::Parser;
+use git_version::git_version;
 use ratatui::layout::Rect;
 use ratatui::prelude::CrosstermBackend;
 use ratatui::{Terminal, TerminalOptions, Viewport};
@@ -10,14 +11,13 @@ use russh::keys::ssh_key::PublicKey;
 use russh::server::{Auth, Msg, Session};
 use tracing::{debug, trace, warn};
 
-use crate::VERSION;
 use crate::io::{Input, TerminalHandle};
 use crate::ldap::{Ldap, LdapError};
 use crate::tunnel::{Registry, Tunnel, TunnelAccess};
 
 /// Quickly create http tunnels for development
 #[derive(Parser, Debug)]
-#[command(version = VERSION, about, long_about = None)]
+#[command(version = git_version!(), about, long_about = None)]
 pub struct Args {
     /// Make all tunnels public by default instead of private
     #[arg(long, group = "access")]

src/ssh/renderer.rs

@@ -17,7 +17,7 @@ use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel};
 use tracing::error;
 use unicode_width::UnicodeWidthStr;
 
-use crate::VERSION;
+use crate::get_version;
 use crate::io::TerminalHandle;
 use crate::tunnel::{Tunnel, TunnelRow};
 
@@ -165,7 +165,7 @@ impl RendererInner {
     }
 
     fn render_title(&self, frame: &mut Frame, rect: Rect) {
-        let title = format!("{} ({})", std::env!("CARGO_PKG_NAME"), VERSION).bold();
+        let title = format!("{} ({})", std::env!("CARGO_PKG_NAME"), get_version()).bold();
         let title = Line::from(title).centered();
         frame.render_widget(title, rect);
     }

src/version.rs

@@ -1,11 +0,0 @@
-pub const VERSION: &str = get_version();
-
-const fn get_version() -> &'static str {
-    if let Some(version) = std::option_env!("RELEASE_VERSION")
-        && !version.is_empty()
-    {
-        version
-    } else {
-        git_version::git_version!(fallback = "unknown")
-    }
-}