diff --git a/ghostflow-gitlab/src/lib.rs b/ghostflow-gitlab/src/lib.rs index bd911d79ce75d9523cbbd8a7fa83b4bac5a58c3c..af9ade74fde6adab0080dc99e420eda7840551f0 100644 --- a/ghostflow-gitlab/src/lib.rs +++ b/ghostflow-gitlab/src/lib.rs @@ -117,10 +117,16 @@ fn ghostflow_user(user: types::FullUser) -> User { fn ghostflow_pipeline_state(status: types::PipelineStatus) -> PipelineState { match status { types::PipelineStatus::Manual => PipelineState::Manual, - types::PipelineStatus::Running + types::PipelineStatus::Created + | types::PipelineStatus::WaitingForResource + | types::PipelineStatus::Preparing + | types::PipelineStatus::WaitingForCallback | types::PipelineStatus::Pending - | types::PipelineStatus::Created => PipelineState::InProgress, - types::PipelineStatus::Canceled | types::PipelineStatus::Skipped => PipelineState::Canceled, + | types::PipelineStatus::Scheduled + | types::PipelineStatus::Running => PipelineState::InProgress, + types::PipelineStatus::Canceling + | types::PipelineStatus::Canceled + | types::PipelineStatus::Skipped => PipelineState::Canceled, types::PipelineStatus::Failed => PipelineState::Failed, types::PipelineStatus::Success => PipelineState::Success, } diff --git a/ghostflow-gitlab/src/types.rs b/ghostflow-gitlab/src/types.rs index 8af14544afad5c157f3b29d7dbc53db82a656bb2..43724f343437577f92958ab706d4e1ba0e56749d 100644 --- a/ghostflow-gitlab/src/types.rs +++ b/ghostflow-gitlab/src/types.rs @@ -181,22 +181,32 @@ pub struct CommitStatus { #[derive(Debug, Clone, Copy, Deserialize)] pub enum PipelineStatus { - #[serde(rename = "running")] - Running, + #[serde(rename = "created")] + Created, + #[serde(rename = "waiting_for_resource")] + WaitingForResource, + #[serde(rename = "preparing")] + Preparing, + #[serde(rename = "waiting_for_callback")] + WaitingForCallback, #[serde(rename = "pending")] Pending, - #[serde(rename = "success")] - Success, + #[serde(rename = "running")] + Running, #[serde(rename = "failed")] Failed, + #[serde(rename = "success")] + Success, + #[serde(rename = "canceling")] + Canceling, #[serde(rename = "canceled")] Canceled, #[serde(rename = "skipped")] Skipped, - #[serde(rename = "created")] - Created, #[serde(rename = "manual")] Manual, + #[serde(rename = "scheduled")] + Scheduled, } #[derive(Debug, Deserialize)]