From 45d2a66730e8fd59973cbef75a75af5a8ffaa1db Mon Sep 17 00:00:00 2001
From: Fiachra Corcoran <fiachra.corcoran@est.tech>
Date: Tue, 27 Aug 2024 17:51:23 +0100
Subject: [PATCH 1/2] Update dev porchctl build to trigger on merge to main

---
 .github/workflows/porchctl-dev-release.yaml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/porchctl-dev-release.yaml b/.github/workflows/porchctl-dev-release.yaml
index e7b379c8..236c7d55 100644
--- a/.github/workflows/porchctl-dev-release.yaml
+++ b/.github/workflows/porchctl-dev-release.yaml
@@ -13,8 +13,23 @@
 # limitations under the License.
 
 name: porchctl dev release
+
 on:
-  push:
+  pull_request:
+    paths-ignore:
+      - "build/**"
+      - "controllers/**"
+      - "deployments/**"
+      - "docs/**"
+      - "examples/**"
+      - "release/**"
+      - "scripts/**"
+      - ".prow.yaml"
+      - "OWNERS"
+    branches:
+      - main
+    types:
+      - closed
 
 jobs:
   build:

From 9acad22fa9f16c752da7fa0ab67ade55a4e71ed7 Mon Sep 17 00:00:00 2001
From: Fiachra Corcoran <fiachra.corcoran@est.tech>
Date: Tue, 27 Aug 2024 17:51:55 +0100
Subject: [PATCH 2/2] Fix e2e to run when deployments dir is changed

---
 .github/workflows/porch-e2e.yaml        | 2 --
 .github/workflows/porchctl-cli-e2e.yaml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/.github/workflows/porch-e2e.yaml b/.github/workflows/porch-e2e.yaml
index 300d72a9..569515da 100644
--- a/.github/workflows/porch-e2e.yaml
+++ b/.github/workflows/porch-e2e.yaml
@@ -18,14 +18,12 @@ on:
     paths-ignore:
       - "docs/**"
       - "release/**"
-      - "deployments/**"
       - ".prow.yaml"
       - "OWNERS"
   pull_request:
     paths-ignore:
       - "docs/**"
       - "release/**"
-      - "deployments/**"
       - ".prow.yaml"
       - "OWNERS"
 jobs:
diff --git a/.github/workflows/porchctl-cli-e2e.yaml b/.github/workflows/porchctl-cli-e2e.yaml
index b5fdbc20..92fad1f7 100644
--- a/.github/workflows/porchctl-cli-e2e.yaml
+++ b/.github/workflows/porchctl-cli-e2e.yaml
@@ -18,14 +18,12 @@ on:
     paths-ignore:
       - "docs/**"
       - "release/**"
-      - "deployments/**"
       - ".prow.yaml"
       - "OWNERS"
   pull_request:
     paths-ignore:
       - "docs/**"
       - "release/**"
-      - "deployments/**"
       - ".prow.yaml"
       - "OWNERS"
 jobs: