diff --git a/Cargo.toml b/Cargo.toml index 783e4b3..be2ba50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "github-actions-models" authors = ["William Woodruff "] description = "Unofficial, high-quality data models for GitHub Actions workflows, actions, and related components" version = "0.26.0" -edition = "2021" +edition = "2024" license = "MIT" repository = "https://github.com/woodruffw/github-actions-models" keywords = ["github", "ci"] diff --git a/src/action.rs b/src/action.rs index ed62575..d94fe88 100644 --- a/src/action.rs +++ b/src/action.rs @@ -11,8 +11,8 @@ use indexmap::IndexMap; use serde::Deserialize; use crate::common::{ - expr::{BoE, LoE}, Env, If, Uses, + expr::{BoE, LoE}, }; /// A GitHub Actions action definition. diff --git a/src/common.rs b/src/common.rs index 2744c97..0aaea66 100644 --- a/src/common.rs +++ b/src/common.rs @@ -6,7 +6,7 @@ use std::{ }; use indexmap::IndexMap; -use serde::{de, Deserialize, Deserializer, Serialize}; +use serde::{Deserialize, Deserializer, Serialize, de}; pub mod expr; @@ -383,7 +383,7 @@ mod tests { use crate::common::{BasePermission, Env, EnvValue, Permission}; use super::{ - reusable_step_uses, DockerUses, LocalUses, Permissions, RepositoryUses, Uses, UsesError, + DockerUses, LocalUses, Permissions, RepositoryUses, Uses, UsesError, reusable_step_uses, }; #[test] diff --git a/src/workflow/job.rs b/src/workflow/job.rs index 7667aa0..b05db71 100644 --- a/src/workflow/job.rs +++ b/src/workflow/job.rs @@ -1,7 +1,7 @@ //! Workflow jobs. use indexmap::IndexMap; -use serde::{de, Deserialize}; +use serde::{Deserialize, de}; use serde_yaml::Value; use crate::common::expr::{BoE, LoE}; @@ -205,7 +205,7 @@ pub enum Secrets { #[cfg(test)] mod tests { use crate::{ - common::{expr::LoE, EnvValue}, + common::{EnvValue, expr::LoE}, workflow::job::{Matrix, Secrets}, }; diff --git a/src/workflow/mod.rs b/src/workflow/mod.rs index 8262136..7a53c24 100644 --- a/src/workflow/mod.rs +++ b/src/workflow/mod.rs @@ -11,8 +11,8 @@ use indexmap::IndexMap; use serde::Deserialize; use crate::common::{ - expr::{BoE, LoE}, Env, Permissions, + expr::{BoE, LoE}, }; pub mod event; diff --git a/tests/test_workflow.rs b/tests/test_workflow.rs index 9e62065..7d1a319 100644 --- a/tests/test_workflow.rs +++ b/tests/test_workflow.rs @@ -2,13 +2,13 @@ use std::{env, path::Path, str::FromStr}; use github_actions_models::{ common::{ - expr::{ExplicitExpr, LoE}, Uses, + expr::{ExplicitExpr, LoE}, }, workflow::{ + Job, Trigger, Workflow, event::OptionalBody, job::{RunsOn, StepBody}, - Job, Trigger, Workflow, }, };