From bc11a49e25ba7f797cccde5002f2e6e206327591 Mon Sep 17 00:00:00 2001
From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date: Wed, 29 May 2024 13:23:19 -0400
Subject: [PATCH] add merge action

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
---
 .../promoter.argoproj.io/PullRequest/actions/discovery.lua     | 3 +++
 .../promoter.argoproj.io/PullRequest/actions/merge/action.lua  | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 resource_customizations/promoter.argoproj.io/PullRequest/actions/discovery.lua
 create mode 100644 resource_customizations/promoter.argoproj.io/PullRequest/actions/merge/action.lua

diff --git a/resource_customizations/promoter.argoproj.io/PullRequest/actions/discovery.lua b/resource_customizations/promoter.argoproj.io/PullRequest/actions/discovery.lua
new file mode 100644
index 0000000000000..1ccf06da18f37
--- /dev/null
+++ b/resource_customizations/promoter.argoproj.io/PullRequest/actions/discovery.lua
@@ -0,0 +1,3 @@
+local actions = {}
+actions["merge"] = {["disabled"] = false}
+return actions
diff --git a/resource_customizations/promoter.argoproj.io/PullRequest/actions/merge/action.lua b/resource_customizations/promoter.argoproj.io/PullRequest/actions/merge/action.lua
new file mode 100644
index 0000000000000..d2d558913ff30
--- /dev/null
+++ b/resource_customizations/promoter.argoproj.io/PullRequest/actions/merge/action.lua
@@ -0,0 +1,2 @@
+obj.spec.state = "merged"
+return obj