From f8597d60c2f58d250cac1e36c0349ce98cb62ec3 Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Thu, 13 Jun 2024 16:09:13 -0400
Subject: [PATCH 01/11] Update unittest.yml

---
 .github/workflows/unittest.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 352c9de90..6b291ce56 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -7,6 +7,10 @@ on:
   pull_request:
     branches: [ develop ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
 

From d48c6eade497dd6119e9a83804f71ee3d8b57278 Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Thu, 13 Jun 2024 16:10:52 -0400
Subject: [PATCH 02/11] Update es-int-tests.yml

---
 .github/workflows/es-int-tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/es-int-tests.yml b/.github/workflows/es-int-tests.yml
index 204721f2a..6018e161f 100644
--- a/.github/workflows/es-int-tests.yml
+++ b/.github/workflows/es-int-tests.yml
@@ -8,6 +8,10 @@ on:
     branches: [ develop ]
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   es-integration-tests:
     name: Elasticsearch Integration Tests

From 4fd594839fd7c5b61bd58e735dd61dbfdbc8cb68 Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Thu, 13 Jun 2024 16:13:32 -0400
Subject: [PATCH 03/11] Update orch-build-tag-publish-and-run-tests.yml

---
 .github/workflows/orch-build-tag-publish-and-run-tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/orch-build-tag-publish-and-run-tests.yml b/.github/workflows/orch-build-tag-publish-and-run-tests.yml
index e3be4a4b9..7daad082c 100644
--- a/.github/workflows/orch-build-tag-publish-and-run-tests.yml
+++ b/.github/workflows/orch-build-tag-publish-and-run-tests.yml
@@ -9,6 +9,11 @@ on:
     branches:
       - develop
     paths-ignore: ['**.md']
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 env:
   GCR_REGISTRY: gcr.io/broad-dsp-gcr-public/firecloud-orchestration
   # Region-specific Google Docker repository where GOOGLE_PROJECT/REPOSITORY_NAME can be found

From 3290b07d4885ba820a9d5262f97327516129658f Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Fri, 14 Jun 2024 09:05:15 -0400
Subject: [PATCH 04/11] Update es-int-tests.yml

---
 .github/workflows/es-int-tests.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/es-int-tests.yml b/.github/workflows/es-int-tests.yml
index 6018e161f..73aef1962 100644
--- a/.github/workflows/es-int-tests.yml
+++ b/.github/workflows/es-int-tests.yml
@@ -1,15 +1,12 @@
 name: Elasticsearch Integration Tests
 
 on:
-  push:
-    paths-ignore:
-      - 'README.md'
   pull_request:
     branches: [ develop ]
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 
 jobs:

From 49133d12ed16985289dd55e1d6637c96372c3962 Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Fri, 14 Jun 2024 09:05:43 -0400
Subject: [PATCH 05/11] Update orch-build-tag-publish-and-run-tests.yml

---
 .github/workflows/orch-build-tag-publish-and-run-tests.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/orch-build-tag-publish-and-run-tests.yml b/.github/workflows/orch-build-tag-publish-and-run-tests.yml
index 7daad082c..96ef4ca3b 100644
--- a/.github/workflows/orch-build-tag-publish-and-run-tests.yml
+++ b/.github/workflows/orch-build-tag-publish-and-run-tests.yml
@@ -5,13 +5,9 @@ name: orch-build-tag-publish-and-run-tests
 on:
   pull_request:
     paths-ignore: ['**.md']
-  push:
-    branches:
-      - develop
-    paths-ignore: ['**.md']
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 
 env:

From 54d0c7c51640937ceb5fa957d99887d6f2104c0f Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Fri, 14 Jun 2024 09:06:01 -0400
Subject: [PATCH 06/11] Update unittest.yml

---
 .github/workflows/unittest.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 6b291ce56..cd763771c 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -1,14 +1,11 @@
 name: Scala CI
 
 on:
-  push:
-    paths-ignore:
-      - 'README.md'
   pull_request:
     branches: [ develop ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 
 jobs:

From 24e81fdc7883e0658577bfaea28a4f887751ebc5 Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Fri, 14 Jun 2024 09:22:42 -0400
Subject: [PATCH 07/11] Update es-int-tests.yml

---
 .github/workflows/es-int-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/es-int-tests.yml b/.github/workflows/es-int-tests.yml
index 73aef1962..dba625ca7 100644
--- a/.github/workflows/es-int-tests.yml
+++ b/.github/workflows/es-int-tests.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref  }}
   cancel-in-progress: true
 
 jobs:

From 5d35ddac04240d609a0f7794908ed45fe88b839a Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Mon, 17 Jun 2024 09:21:27 -0400
Subject: [PATCH 08/11] Update es-int-tests.yml

---
 .github/workflows/es-int-tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/es-int-tests.yml b/.github/workflows/es-int-tests.yml
index dba625ca7..b77039878 100644
--- a/.github/workflows/es-int-tests.yml
+++ b/.github/workflows/es-int-tests.yml
@@ -1,6 +1,10 @@
 name: Elasticsearch Integration Tests
 
 on:
+  push:
+    branches: [ develop ]
+    paths-ignore:
+      - 'README.md'
   pull_request:
     branches: [ develop ]
   workflow_dispatch:

From 975181d8fe7bcdf8be189a748b48495a3b062143 Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Mon, 17 Jun 2024 09:21:49 -0400
Subject: [PATCH 09/11] Update es-int-tests.yml

---
 .github/workflows/es-int-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/es-int-tests.yml b/.github/workflows/es-int-tests.yml
index b77039878..f4e19100a 100644
--- a/.github/workflows/es-int-tests.yml
+++ b/.github/workflows/es-int-tests.yml
@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref  }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:

From 00ccc2e13d87b995322fb62cb89071ff4cc05cd1 Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Mon, 17 Jun 2024 09:22:10 -0400
Subject: [PATCH 10/11] Update orch-build-tag-publish-and-run-tests.yml

---
 .github/workflows/orch-build-tag-publish-and-run-tests.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/orch-build-tag-publish-and-run-tests.yml b/.github/workflows/orch-build-tag-publish-and-run-tests.yml
index 96ef4ca3b..7daad082c 100644
--- a/.github/workflows/orch-build-tag-publish-and-run-tests.yml
+++ b/.github/workflows/orch-build-tag-publish-and-run-tests.yml
@@ -5,9 +5,13 @@ name: orch-build-tag-publish-and-run-tests
 on:
   pull_request:
     paths-ignore: ['**.md']
+  push:
+    branches:
+      - develop
+    paths-ignore: ['**.md']
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 env:

From fbe054308ba282798907b32d871ca71a4a542942 Mon Sep 17 00:00:00 2001
From: Bria Morgan <calypsomatic@gmail.com>
Date: Mon, 17 Jun 2024 09:22:39 -0400
Subject: [PATCH 11/11] Update unittest.yml

---
 .github/workflows/unittest.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index cd763771c..774806461 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -3,9 +3,13 @@ name: Scala CI
 on:
   pull_request:
     branches: [ develop ]
+  push:
+    paths-ignore:
+      - 'README.md'
+    branches: [ develop ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs: