From 6d99b16b287a14c3122f2b6594ef2f4204a1c78a Mon Sep 17 00:00:00 2001 From: Yobannys Cabrera Gonzalez Date: Tue, 5 Sep 2023 15:29:57 -0400 Subject: [PATCH] Adding `next_run_start_at` to the merge conflict, when scheduler updates Signed-off-by: Yobannys Cabrera Gonzalez --- .changeset/real-turkeys-report.md | 5 +++++ packages/backend-tasks/src/tasks/TaskWorker.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/real-turkeys-report.md diff --git a/.changeset/real-turkeys-report.md b/.changeset/real-turkeys-report.md new file mode 100644 index 0000000000..7e13f3a937 --- /dev/null +++ b/.changeset/real-turkeys-report.md @@ -0,0 +1,5 @@ +--- +'@backstage/backend-tasks': patch +--- + +Fixed bug in backend TaskWorker, adding `next_run_start_at` as a merge conflict when scheduler changes diff --git a/packages/backend-tasks/src/tasks/TaskWorker.ts b/packages/backend-tasks/src/tasks/TaskWorker.ts index a03d1ec058..f1acb4ed19 100644 --- a/packages/backend-tasks/src/tasks/TaskWorker.ts +++ b/packages/backend-tasks/src/tasks/TaskWorker.ts @@ -199,7 +199,7 @@ export class TaskWorker { next_run_start_at: startAt, }) .onConflict('id') - .merge(['settings_json']); + .merge(['settings_json', 'next_run_start_at']); } /**