From c0fba442cdbf82edaeeab23c277762af96482ac4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 3 Mar 2025 20:37:39 +0100 Subject: [PATCH 1/2] gitlab/types: sort `PipelineStatus` as done in upstream Makes it easier to compare with upstream's source. --- ghostflow-gitlab/src/lib.rs | 4 ++-- ghostflow-gitlab/src/types.rs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ghostflow-gitlab/src/lib.rs b/ghostflow-gitlab/src/lib.rs index bd911d79..f96943f7 100644 --- a/ghostflow-gitlab/src/lib.rs +++ b/ghostflow-gitlab/src/lib.rs @@ -117,9 +117,9 @@ 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::Pending - | types::PipelineStatus::Created => PipelineState::InProgress, + | types::PipelineStatus::Running => PipelineState::InProgress, 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 8af14544..9a6d4ebb 100644 --- a/ghostflow-gitlab/src/types.rs +++ b/ghostflow-gitlab/src/types.rs @@ -181,20 +181,20 @@ pub struct CommitStatus { #[derive(Debug, Clone, Copy, Deserialize)] pub enum PipelineStatus { - #[serde(rename = "running")] - Running, + #[serde(rename = "created")] + Created, #[serde(rename = "pending")] Pending, - #[serde(rename = "success")] - Success, + #[serde(rename = "running")] + Running, #[serde(rename = "failed")] Failed, + #[serde(rename = "success")] + Success, #[serde(rename = "canceled")] Canceled, #[serde(rename = "skipped")] Skipped, - #[serde(rename = "created")] - Created, #[serde(rename = "manual")] Manual, } -- GitLab From f32735d3206900fb2e295aa2bf67e41b8d582ea7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 3 Mar 2025 20:40:40 +0100 Subject: [PATCH 2/2] gitlab/types: add more `PipelineStatus` variants --- ghostflow-gitlab/src/lib.rs | 8 +++++++- ghostflow-gitlab/src/types.rs | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ghostflow-gitlab/src/lib.rs b/ghostflow-gitlab/src/lib.rs index f96943f7..af9ade74 100644 --- a/ghostflow-gitlab/src/lib.rs +++ b/ghostflow-gitlab/src/lib.rs @@ -118,9 +118,15 @@ fn ghostflow_pipeline_state(status: types::PipelineStatus) -> PipelineState { match status { types::PipelineStatus::Manual => PipelineState::Manual, types::PipelineStatus::Created + | types::PipelineStatus::WaitingForResource + | types::PipelineStatus::Preparing + | types::PipelineStatus::WaitingForCallback | types::PipelineStatus::Pending + | types::PipelineStatus::Scheduled | types::PipelineStatus::Running => PipelineState::InProgress, - types::PipelineStatus::Canceled | types::PipelineStatus::Skipped => PipelineState::Canceled, + 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 9a6d4ebb..43724f34 100644 --- a/ghostflow-gitlab/src/types.rs +++ b/ghostflow-gitlab/src/types.rs @@ -183,6 +183,12 @@ pub struct CommitStatus { pub enum PipelineStatus { #[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 = "running")] @@ -191,12 +197,16 @@ pub enum PipelineStatus { Failed, #[serde(rename = "success")] Success, + #[serde(rename = "canceling")] + Canceling, #[serde(rename = "canceled")] Canceled, #[serde(rename = "skipped")] Skipped, #[serde(rename = "manual")] Manual, + #[serde(rename = "scheduled")] + Scheduled, } #[derive(Debug, Deserialize)] -- GitLab