Runs CI for all crates in workspace

helsing-ai · Oct 20, 2023 · f5f6a62 · f5f6a62
1 parent 6460682
commit f5f6a62
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,15 +11,15 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: rustup update && rustup component add rustfmt
-      - run: cargo fmt -- --check
+      - run: cargo fmt --check --all
 
   clippy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - run: rustup update && rustup component add clippy
       - uses: Swatinem/rust-cache@v2
-      - run: cargo clippy --all-targets -- -D warnings -D clippy::all
+      - run: cargo clippy --all-targets --workspace -- -D warnings -D clippy::all
 
   test:
     runs-on: ubuntu-latest
@@ -29,7 +29,7 @@ jobs:
           lfs: 'true'
       - run: rustup update
       - uses: Swatinem/rust-cache@v2
-      - run: cargo test
+      - run: cargo test --workspace
         env:
           RUST_BACKTRACE: 1
 
@@ -40,7 +40,7 @@ jobs:
       - run: rustup update
       - uses: Swatinem/rust-cache@v2
       - run: cargo install cargo-deny || true
-      - run: cargo deny check
+      - run: cargo deny --workspace check
 
   typos:
     runs-on: ubuntu-latest

diff --git a/registry/Cargo.toml b/registry/Cargo.toml
@@ -2,9 +2,11 @@
 name = "buffrs-registry"
 version = "0.1.0"
 edition = "2021"
+description = "Registry for buffrs, a modern protocol buffer package manager"
+license = "Apache-2.0"
 
 [dependencies]
-buffrs = { path = "../" }
+buffrs = { path = "../", version = "0.6.4" }
 prost = "0.12.1"
 tonic = "0.10.2"
 clap = { version = "4.3", features = ["cargo", "derive", "env"] }
@@ -16,4 +18,4 @@ eyre = "0.6.8"
 url = "2.4.1"
 
 [build-dependencies]
-buffrs = { path = "../" }
+buffrs = { path = "../", version = "0.6.4" }
diff --git a/registry/src/main.rs b/registry/src/main.rs
@@ -19,6 +19,6 @@ use clap::Parser;
 async fn main() -> eyre::Result<()> {
     let config = Options::parse();
     tracing_subscriber::fmt::init();
-    let db = connect(&config.database.as_str()).await.unwrap();
+    let _db = connect(config.database.as_str()).await.unwrap();
     Ok(())
 }
diff --git a/src/credentials.rs b/src/credentials.rs
@@ -14,7 +14,7 @@
 
 use miette::{miette, Context, Diagnostic, IntoDiagnostic};
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, env, path::PathBuf};
+use std::{collections::HashMap, env, io::ErrorKind, path::PathBuf};
 use thiserror::Error;
 use tokio::fs;
 
@@ -63,14 +63,22 @@ impl Credentials {
 
     /// Reads the credentials from the file system
     pub async fn read() -> miette::Result<Self> {
-        let raw: RawCredentialCollection = toml::from_str(
-            &fs::read_to_string(location().into_diagnostic()?)
-                .await
-                .into_diagnostic()
-                .wrap_err(ReadError(CREDENTIALS_FILE))?,
-        )
-        .into_diagnostic()
-        .wrap_err(DeserializationError(ManagedFile::Credentials))?;
+        let location = location().into_diagnostic()?;
+
+        // if the file does not exist, we don't need to treat it as an error.
+        let contents = match fs::read_to_string(&location).await {
+            Ok(contents) => contents,
+            Err(error) if error.kind() == ErrorKind::NotFound => Default::default(),
+            Err(error) => {
+                return Err(error)
+                    .into_diagnostic()
+                    .wrap_err(ReadError(CREDENTIALS_FILE))
+            }
+        };
+
+        let raw: RawCredentialCollection = toml::from_str(&contents)
+            .into_diagnostic()
+            .wrap_err(DeserializationError(ManagedFile::Credentials))?;
 
         Ok(raw.into())
     }