last fix and add to ci

bytecodealliance · Mar 6, 2024 · 9ac4270 · 9ac4270
1 parent dfc28f8
commit 9ac4270
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/ci/publish.rs b/ci/publish.rs
@@ -4,7 +4,7 @@
 //! * `./publish verify` - verify crates can be published to crates.io
 //! * `./publish publish` - actually publish crates to crates.io
 
-use indexmap::{IndexMap};
+use indexmap::IndexMap;
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -20,6 +20,7 @@ const CRATES_TO_PUBLISH: &[&str] = &[
     "warg-protocol",
     "warg-api",
     "warg-client",
+    "warg-credentials",
     "warg-server",
     "warg-cli",
 ];
@@ -35,6 +36,7 @@ const PUBLIC_CRATES: &[&str] = &[
     "warg-protocol",
     "warg-api",
     "warg-client",
+    "warg-credentials",
     "warg-server",
     "warg-cli",
 ];
@@ -161,7 +163,10 @@ fn read_crate(ws: Option<&Workspace>, manifest: &Path) -> Crate {
             );
         }
         if let Some(ws) = ws {
-            if version.is_none() && (line.starts_with("version.workspace = true") || line.starts_with("version = { workspace = true }")) {
+            if version.is_none()
+                && (line.starts_with("version.workspace = true")
+                    || line.starts_with("version = { workspace = true }"))
+            {
                 version = Some(ws.version.clone());
             }
         }

diff --git a/crates/client/src/api.rs b/crates/client/src/api.rs
@@ -216,7 +216,6 @@ impl Client {
     pub fn url(&self) -> &RegistryUrl {
         &self.url
     }
-
     /// Gets the latest checkpoint from the registry.
     pub async fn latest_checkpoint(
         &self,

diff --git a/crates/client/src/config.rs b/crates/client/src/config.rs
@@ -191,7 +191,7 @@ impl Config {
                 pathdiff::diff_paths(&p, &parent).unwrap()
             }),
             keys: self.keys.clone(),
-            keyring_auth: false,
+            keyring_auth: self.keyring_auth,
         };
 
         serde_json::to_writer_pretty(

diff --git a/src/commands/login.rs b/src/commands/login.rs
@@ -66,20 +66,21 @@ impl LoginCommand {
                 .context("failed to read token")?;
             self.keyring_entry
                 .set_entry(self.common.read_config()?.home_url, &token)?;
+            config.keyring_auth = true;
             config.write_to_file(&Config::default_config_path()?)?;
             println!("auth token was set successfully, and generated default key",);
             println!("Public Key: {public_key}");
             return Ok(());
         }
-        config.keyring_auth = true;
-        config.write_to_file(&Config::default_config_path()?)?;
 
         let token = Password::with_theme(&ColorfulTheme::default())
             .with_prompt("Enter auth token")
             .interact()
             .context("failed to read token")?;
         self.keyring_entry
             .set_entry(self.common.read_config()?.home_url, &token)?;
+        config.keyring_auth = true;
+        config.write_to_file(&Config::default_config_path()?)?;
         println!("auth token was set successfully",);
         Ok(())
     }