@@ -350,7 +350,7 @@ watch(stepSlug, async () => {
watch(step, async (newStep, oldStep) => {
if (oldStep?.name === newStep?.name) {
- if (oldStep?.end_time !== newStep?.end_time && autoScroll.value) {
+ if (oldStep?.finished !== newStep?.finished && autoScroll.value) {
scrollDown();
}
diff --git a/web/src/components/repo/pipeline/PipelineStepDuration.vue b/web/src/components/repo/pipeline/PipelineStepDuration.vue
index 8fd6e03d39..0b79a4bd1a 100644
--- a/web/src/components/repo/pipeline/PipelineStepDuration.vue
+++ b/web/src/components/repo/pipeline/PipelineStepDuration.vue
@@ -19,8 +19,8 @@ const workflow = toRef(props, 'workflow');
const { durationAsNumber } = useDate();
const durationRaw = computed(() => {
- const start = (step.value ? step.value?.start_time : workflow.value?.start_time) || 0;
- const end = (step.value ? step.value?.end_time : workflow.value?.end_time) || 0;
+ const start = (step.value ? step.value?.started : workflow.value?.started) || 0;
+ const end = (step.value ? step.value?.finished : workflow.value?.finished) || 0;
if (end === 0 && start === 0) {
return undefined;
@@ -43,5 +43,5 @@ const duration = computed(() => {
return durationAsNumber(durationElapsed.value || 0);
});
-const started = computed(() => (step.value ? step.value?.start_time : workflow.value?.start_time) !== undefined);
+const started = computed(() => (step.value ? step.value?.started : workflow.value?.started) !== undefined);
diff --git a/web/src/components/repo/pipeline/PipelineStepList.vue b/web/src/components/repo/pipeline/PipelineStepList.vue
index 18e117a4ce..50006de256 100644
--- a/web/src/components/repo/pipeline/PipelineStepList.vue
+++ b/web/src/components/repo/pipeline/PipelineStepList.vue
@@ -82,7 +82,7 @@
{{ workflow.name }}
diff --git a/web/src/compositions/usePipeline.ts b/web/src/compositions/usePipeline.ts
index d02409fdbb..b4c8a6804d 100644
--- a/web/src/compositions/usePipeline.ts
+++ b/web/src/compositions/usePipeline.ts
@@ -14,7 +14,7 @@ export default (pipeline: Ref
) => {
return undefined;
}
- const start = pipeline.value.created_at || 0;
+ const start = pipeline.value.created || 0;
return start * 1000;
});
@@ -44,8 +44,8 @@ export default (pipeline: Ref) => {
return undefined;
}
- const start = pipeline.value.started_at || 0;
- const end = pipeline.value.finished_at || pipeline.value.updated_at || 0;
+ const start = pipeline.value.started || 0;
+ const end = pipeline.value.finished || pipeline.value.updated || 0;
if (start === 0 || end === 0) {
return 0;
@@ -109,7 +109,7 @@ export default (pipeline: Ref) => {
return undefined;
}
- const start = pipeline.value.created_at || 0;
+ const start = pipeline.value.created || 0;
return toLocaleString(new Date(start * 1000));
});
diff --git a/web/src/lib/api/types/pipeline.ts b/web/src/lib/api/types/pipeline.ts
index 18b784e6d6..2ca9ccf0d8 100644
--- a/web/src/lib/api/types/pipeline.ts
+++ b/web/src/lib/api/types/pipeline.ts
@@ -25,16 +25,16 @@ export interface Pipeline {
errors?: PipelineError[];
// When the pipeline request was received.
- created_at: number;
+ created: number;
// When the pipeline was updated last time in database.
- updated_at: number;
+ updated: number;
// When the pipeline began execution.
- started_at: number;
+ started: number;
// When the pipeline was finished.
- finished_at: number;
+ finished: number;
// Where the deployment should go.
deploy_to: string;
@@ -76,13 +76,9 @@ export interface Pipeline {
// This url will point to the repository state associated with the pipeline's commit.
forge_url: string;
- signed: boolean;
-
- verified: boolean;
-
reviewed_by: string;
- reviewed_at: number;
+ reviewed: number;
// The steps associated with this pipeline.
// A pipeline will have multiple steps if a matrix pipeline was used or if a rebuild was requested.
@@ -110,8 +106,8 @@ export interface PipelineWorkflow {
name: string;
state: PipelineStatus;
environ?: Record;
- start_time?: number;
- end_time?: number;
+ started?: number;
+ finished?: number;
agent_id?: number;
error?: string;
children: PipelineStep[];
@@ -126,8 +122,8 @@ export interface PipelineStep {
name: string;
state: PipelineStatus;
exit_code: number;
- start_time?: number;
- end_time?: number;
+ started?: number;
+ finished?: number;
error?: string;
type?: StepType;
}
diff --git a/web/src/utils/helpers.ts b/web/src/utils/helpers.ts
index ecd2b47f23..2efb9818b6 100644
--- a/web/src/utils/helpers.ts
+++ b/web/src/utils/helpers.ts
@@ -46,7 +46,7 @@ export function isStepRunning(step: PipelineStep): boolean {
* @returns {number} 0 if created at the same time, < 0 if b was create before a, > 0 otherwise
*/
export function comparePipelines(a: Pipeline, b: Pipeline): number {
- return (b.created_at || -1) - (a.created_at || -1);
+ return (b.created || -1) - (a.created || -1);
}
/**
diff --git a/woodpecker-go/woodpecker/types.go b/woodpecker-go/woodpecker/types.go
index b9622ddb6b..09bf183cab 100644
--- a/woodpecker-go/woodpecker/types.go
+++ b/woodpecker-go/woodpecker/types.go
@@ -69,35 +69,32 @@ type (
// Pipeline defines a pipeline object.
Pipeline struct {
- ID int64 `json:"id"`
- Number int64 `json:"number"`
- Parent int64 `json:"parent"`
- Event string `json:"event"`
- Status string `json:"status"`
- Errors []*PipelineError `json:"errors"`
- // Deprecated TODO remove in 3.x
- Enqueued int64 `json:"enqueued_at"`
- Created int64 `json:"created_at"`
- Updated int64 `json:"updated_at"`
- Started int64 `json:"started_at"`
- Finished int64 `json:"finished_at"`
- Deploy string `json:"deploy_to"`
- Commit string `json:"commit"`
- Branch string `json:"branch"`
- Ref string `json:"ref"`
- Refspec string `json:"refspec"`
- CloneURL string `json:"clone_url"`
- Title string `json:"title"`
- Message string `json:"message"`
- Timestamp int64 `json:"timestamp"`
- Sender string `json:"sender"`
- Author string `json:"author"`
- Avatar string `json:"author_avatar"`
- Email string `json:"author_email"`
- ForgeURL string `json:"forge_url"`
- Reviewer string `json:"reviewed_by"`
- Reviewed int64 `json:"reviewed_at"`
- Workflows []*Workflow `json:"workflows,omitempty"`
+ ID int64 `json:"id"`
+ Number int64 `json:"number"`
+ Parent int64 `json:"parent"`
+ Event string `json:"event"`
+ Status string `json:"status"`
+ Errors []*PipelineError `json:"errors"`
+ Created int64 `json:"created_at"`
+ Updated int64 `json:"updated_at"`
+ Started int64 `json:"started_at"`
+ Finished int64 `json:"finished_at"`
+ Deploy string `json:"deploy_to"`
+ Commit string `json:"commit"`
+ Branch string `json:"branch"`
+ Ref string `json:"ref"`
+ Refspec string `json:"refspec"`
+ Title string `json:"title"`
+ Message string `json:"message"`
+ Timestamp int64 `json:"timestamp"`
+ Sender string `json:"sender"`
+ Author string `json:"author"`
+ Avatar string `json:"author_avatar"`
+ Email string `json:"author_email"`
+ ForgeURL string `json:"forge_url"`
+ Reviewer string `json:"reviewed_by"`
+ Reviewed int64 `json:"reviewed_at"`
+ Workflows []*Workflow `json:"workflows,omitempty"`
}
// Workflow represents a workflow in the pipeline.
@@ -137,10 +134,6 @@ type (
Address string `json:"address"`
Username string `json:"username"`
Password string `json:"password,omitempty"`
- // Deprecated
- Email string `json:"email"` // TODO: remove in 3.x
- // Deprecated
- Token string `json:"token"` // TODO: remove in 3.x
}
// Secret represents a secret variable, such as a password or token.
@@ -161,9 +154,9 @@ type (
Number int64 `json:"number,omitempty"`
Event string `json:"event,omitempty"`
Status string `json:"status,omitempty"`
- Created int64 `json:"created_at,omitempty"`
- Started int64 `json:"started_at,omitempty"`
- Finished int64 `json:"finished_at,omitempty"`
+ Created int64 `json:"created,omitempty"`
+ Started int64 `json:"started,omitempty"`
+ Finished int64 `json:"finished,omitempty"`
Commit string `json:"commit,omitempty"`
Branch string `json:"branch,omitempty"`
Ref string `json:"ref,omitempty"`
@@ -183,31 +176,21 @@ type (
Commit string `json:"commit,omitempty"`
}
- //nolint:godot
- // TODO: use dedicated struct in 3.x
- // QueueStats struct {
- // Workers int `json:"worker_count"`
- // Pending int `json:"pending_count"`
- // WaitingOnDeps int `json:"waiting_on_deps_count"`
- // Running int `json:"running_count"`
- // Complete int `json:"completed_count"`
- // }
+ QueueStats struct {
+ Workers int `json:"worker_count"`
+ Pending int `json:"pending_count"`
+ WaitingOnDeps int `json:"waiting_on_deps_count"`
+ Running int `json:"running_count"`
+ Complete int `json:"completed_count"`
+ }
// Info provides queue stats.
Info struct {
- Pending []Task `json:"pending"`
- WaitingOnDeps []Task `json:"waiting_on_deps"`
- Running []Task `json:"running"`
- // TODO: use dedicated struct in 3.x
- // Stats QueueStats `json:"stats"`
- Stats struct {
- Workers int `json:"worker_count"`
- Pending int `json:"pending_count"`
- WaitingOnDeps int `json:"waiting_on_deps_count"`
- Running int `json:"running_count"`
- Complete int `json:"completed_count"`
- } `json:"stats"`
- Paused bool `json:"paused,omitempty"`
+ Pending []Task `json:"pending"`
+ WaitingOnDeps []Task `json:"waiting_on_deps"`
+ Running []Task `json:"running"`
+ Stats QueueStats `json:"stats"`
+ Paused bool `json:"paused,omitempty"`
}
// LogLevel is for checking/setting logging level.
@@ -233,7 +216,7 @@ type (
CreatorID int64 `json:"creator_id"`
NextExec int64 `json:"next_exec"`
Schedule string `json:"schedule"`
- Created int64 `json:"created_at"`
+ Created int64 `json:"created"`
Branch string `json:"branch"`
}