Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/chore-replace-serde-yaml.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@googleworkspace/cli": patch
---

chore: replace deprecated serde_yaml with serde_yml
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ratatui = "0.30.0"
crossterm = "0.29.0"
chrono = "0.4.44"
async-trait = "0.1.89"
serde_yaml = "0.9.34"
serde_yml = "0.0.12"
percent-encoding = "2.3.2"
zeroize = { version = "1.8.2", features = ["derive"] }

Expand Down
16 changes: 8 additions & 8 deletions src/generate_skills.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ pub async fn handle_generate_skills(args: &[String]) -> Result<(), GwsError> {
.as_ref()
.is_none_or(|f| "persona".contains(f.as_str()) || "personas".contains(f.as_str()))
{
if let Ok(registry) = serde_yaml::from_str::<PersonaRegistry>(PERSONAS_YAML) {
if let Ok(registry) = serde_yml::from_str::<PersonaRegistry>(PERSONAS_YAML) {
eprintln!(
"Generating skills for {} personas...",
registry.personas.len()
Expand All @@ -224,8 +224,8 @@ pub async fn handle_generate_skills(args: &[String]) -> Result<(), GwsError> {
});
}
}
} else {
eprintln!("WARNING: Failed to parse personas.yaml");
} else if let Err(e) = serde_yml::from_str::<PersonaRegistry>(PERSONAS_YAML) {
eprintln!("WARNING: Failed to parse personas.yaml: {e}");
}
}

Expand All @@ -234,7 +234,7 @@ pub async fn handle_generate_skills(args: &[String]) -> Result<(), GwsError> {
.as_ref()
.is_none_or(|f| "recipe".contains(f.as_str()) || "recipes".contains(f.as_str()))
{
if let Ok(registry) = serde_yaml::from_str::<RecipeRegistry>(RECIPES_YAML) {
if let Ok(registry) = serde_yml::from_str::<RecipeRegistry>(RECIPES_YAML) {
eprintln!(
"Generating skills for {} recipes...",
registry.recipes.len()
Expand All @@ -255,8 +255,8 @@ pub async fn handle_generate_skills(args: &[String]) -> Result<(), GwsError> {
});
}
}
} else {
eprintln!("WARNING: Failed to parse recipes.yaml");
} else if let Err(e) = serde_yml::from_str::<RecipeRegistry>(RECIPES_YAML) {
eprintln!("WARNING: Failed to parse recipes.yaml: {e}");
}
}

Expand Down Expand Up @@ -968,9 +968,9 @@ mod tests {
#[test]
fn test_registry_references() {
let personas: PersonaRegistry =
serde_yaml::from_str(PERSONAS_YAML).expect("valid personas yaml");
serde_yml::from_str(PERSONAS_YAML).expect("valid personas yaml");
let recipes: RecipeRegistry =
serde_yaml::from_str(RECIPES_YAML).expect("valid recipes yaml");
serde_yml::from_str(RECIPES_YAML).expect("valid recipes yaml");

// Valid services mapped by api_name or alias
let all_services = services::SERVICES;
Expand Down
Loading