From d40739f2883d2cdd0961ea7444ba9e8118f23e53 Mon Sep 17 00:00:00 2001
From: Curt Bushko <cbushko@gmail.com>
Date: Fri, 14 Apr 2023 13:45:59 -0400
Subject: [PATCH] Update status on PRs (#2054)

* Update status on PRs
* Split pr and push into 2 different files so that context can be passed through
---
 .github/workflows/merge.yml | 31 +++++++++++++++++++++++++++++++
 .github/workflows/pr.yml    | 14 ++++----------
 2 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/merge.yml

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
new file mode 100644
index 0000000000..be1b392f4a
--- /dev/null
+++ b/.github/workflows/merge.yml
@@ -0,0 +1,31 @@
+# Dispatch to the consul-k8s-workflows when a PR is created and on merges to main/release*
+name: merge
+on:
+  push:
+    # Sequence of patterns matched against refs/heads
+    branches:
+      # Push events on main branch
+      - main
+      # Push events to branches matching refs/heads/release/**
+      - "release/**"
+
+# these should be the only settings that you will ever need to change
+env:
+  CONSUL_IMAGE: hashicorppreview/consul-enterprise:1.16-dev # Consul's enterprise version to use in tests. We use this consul image on release branches too
+  BRANCH: ${{ github.head_ref || github.ref_name }}
+  CONTEXT: "merge"
+  SHA: ${{ github.event.pull_request.head.sha || github.sha }}
+
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: benc-uk/workflow-dispatch@v1.2.2
+      name: test
+      with:
+        workflow: test.yml
+        repo: hashicorp/consul-k8s-workflows
+        ref: main
+        token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
+        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}", "consul-image":"${{ env.CONSUL_IMAGE }}" }'
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d006c2514c..32baf472fb 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -2,19 +2,13 @@
 name: pr
 on:
   pull_request:
-  push:
-    # Sequence of patterns matched against refs/heads
-    branches:
-      # Push events on main branch
-      - main
-      # Push events to branches matching refs/heads/release/**
-      - "release/**"
 
 # these should be the only settings that you will ever need to change
 env:
   CONSUL_IMAGE: hashicorppreview/consul-enterprise:1.16-dev # Consul's enterprise version to use in tests. We use this consul image on release branches too
-  BRANCH: ${{ github.head_ref || github.ref_name }} 
-  CONTEXT: "${{ github.actor }}"
+  BRANCH: ${{ github.head_ref || github.ref_name }}
+  CONTEXT: "pr"
+  SHA: ${{ github.event.pull_request.head.sha || github.sha }}
 
 jobs:
   test:
@@ -28,4 +22,4 @@ jobs:
         repo: hashicorp/consul-k8s-workflows
         ref: main
         token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ github.sha }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}", "consul-image":"${{ env.CONSUL_IMAGE }}" }'
+        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}", "consul-image":"${{ env.CONSUL_IMAGE }}" }'