fix conflict

2025-01-19 19:02:58 +08:00
parent e6e964aa8c 11d654e902
commit 1b362673c0
142 changed files with 3458 additions and 8971 deletions
--- a/ui/src/domain/workflow.ts
+++ b/ui/src/domain/workflow.ts
@@ -114,8 +114,10 @@ export type WorkflowNodeConfigForApply = {
  providerConfig?: Record<string, unknown>;
  keyAlgorithm: string;
  nameservers?: string;
-  propagationTimeout?: number;
+  dnsPropagationTimeout?: number;
+  dnsTTL?: number;
  disableFollowCNAME?: boolean;
+  skipBeforeExpiryDays: number;
 };

 export type WorkflowNodeConfigForDeploy = {
@@ -123,6 +125,7 @@ export type WorkflowNodeConfigForDeploy = {
  provider: string;
  providerAccessId: string;
  providerConfig: Record<string, unknown>;
+  skipOnLastSucceeded: boolean;
 };

 export type WorkflowNodeConfigForNotify = {