fix: support workspaces without git

Author: dmeijboom

.github/workflows/test.yml

@@ -50,4 +50,4 @@ jobs:
       - name: Set up Steiger
         run: cargo install --path .
       - name: Run tests
-        run: steiger --dir tests/${{ matrix.test }} build --profile ${{ matrix.profile }}
+        run: steiger --dir tests/${{ matrix.test }} build

src/config.rs

@@ -10,7 +10,7 @@ use serde_yml::{Mapping, Value};
 
 use crate::git;
 
-const DEFAULT_TAG_FORMAT: &str = "${gitTag:$gitShortCommit}${gitDirty:}";
+const DEFAULT_TAG_FORMAT: &str = "${gitTag:${gitShortCommit:unknown}}${gitDirty:}";
 
 #[derive(Debug, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
@@ -128,11 +128,15 @@ fn template(vars: &HashMap<String, String>, config: Value) -> Result<Value, subs
 fn extract_git_vars(state: git::State) -> HashMap<String, String> {
     let mut vars = HashMap::new();
 
-    vars.insert("gitShortCommit".to_string(), state.commit[0..6].to_string());
-    vars.insert("gitCommit".to_string(), state.commit);
+    if let Some(commit) = state.commit {
+        vars.insert("gitShortCommit".to_string(), commit[0..6].to_string());
+        vars.insert("gitCommit".to_string(), commit);
+    }
+
     if let Some(tag) = state.tag {
         vars.insert("gitTag".to_string(), tag);
     }
+
     if state.dirty {
         vars.insert("gitDirty".to_string(), "-dirty".to_string());
     }

src/git.rs

@@ -50,11 +50,16 @@ fn is_dirty(repo: &Repository) -> Result<bool, gix::status::is_dirty::Error> {
 pub struct State {
     pub dirty: bool,
     pub tag: Option<String>,
-    pub commit: String,
+    pub commit: Option<String>,
 }
 
 pub async fn state() -> Result<State, GitError> {
-    let repo = gix::open(".")?;
+    let repo = match gix::open(".") {
+        Ok(repo) => repo,
+        Err(gix::open::Error::NotARepository { .. }) => return Ok(State::default()),
+        Err(e) => return Err(GitError::Open(e)),
+    };
+
     let mut head = repo.head()?;
     let mut state = State {
         dirty: is_dirty(&repo)?,
@@ -68,7 +73,7 @@ pub async fn state() -> Result<State, GitError> {
     }
 
     if let Ok(commit) = head.peel_to_commit_in_place() {
-        state.commit = commit.id.to_hex().to_string();
+        state.commit = Some(commit.id.to_hex().to_string());
     }
 
     Ok(state)

src/main.rs

@@ -111,8 +111,6 @@ enum AppError {
     #[error(transparent)]
     #[diagnostic(transparent)]
     Deploy(#[from] cmd::deploy::Error),
-    #[error("failed to get current dir")]
-    CurrentDir(std::io::Error),
     #[error("failed to set current dir")]
     SetCurrentDir(std::io::Error),
     #[error("failed to create temp file")]
@@ -128,15 +126,12 @@ impl From<cmd::build::Error> for AppError {
 }
 
 async fn run(opts: Opts) -> Result<(), AppError> {
-    let dir = opts
-        .dir
-        .map(Ok)
-        .unwrap_or_else(env::current_dir)
-        .map_err(AppError::CurrentDir)?;
-    let config_path = opts.config.unwrap_or_else(|| dir.join("steiger.yml"));
-    let detected_platform = detect_platform().await;
+    if let Some(dir) = opts.dir {
+        env::set_current_dir(&dir).map_err(AppError::SetCurrentDir)?;
+    }
 
-    env::set_current_dir(&dir).map_err(AppError::SetCurrentDir)?;
+    let config_path = opts.config.unwrap_or_else(|| "steiger.yml".into());
+    let detected_platform = detect_platform().await;
 
     match opts.cmd {
         Cmd::Build {