From bf8256731dbd893d884e554af020f138bdb094ba Mon Sep 17 00:00:00 2001
From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com>
Date: Tue, 13 Aug 2024 21:26:23 -0400
Subject: [PATCH 1/2] restore single deployment file

---
 .github/workflows/deploy_tests_on_pull_request.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/deploy_tests_on_pull_request.yml b/.github/workflows/deploy_tests_on_pull_request.yml
index 15a6c31b0..f006b1d2b 100644
--- a/.github/workflows/deploy_tests_on_pull_request.yml
+++ b/.github/workflows/deploy_tests_on_pull_request.yml
@@ -9,6 +9,17 @@ concurrency:
 
 jobs:
 
+  DevTests:
+    uses: ./.github/workflows/testing_dev.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  LiveServices:
+    uses: ./.github/workflows/testing_dev_with_live_services.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      DANDI_STAGING_API_KEY: ${{ secrets.DANDI_STAGING_API_KEY }}
+
   BuildTests:
     uses: ./.github/workflows/testing_flask_build_and_dist.yml
 

From 3e282045b239f8d8f3390f988c858c4cb6590dfa Mon Sep 17 00:00:00 2001
From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com>
Date: Tue, 13 Aug 2024 21:27:02 -0400
Subject: [PATCH 2/2] Delete .github/workflows/e2e_tests_on_pull_request.yml

---
 .../workflows/e2e_tests_on_pull_request.yml   | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 .github/workflows/e2e_tests_on_pull_request.yml

diff --git a/.github/workflows/e2e_tests_on_pull_request.yml b/.github/workflows/e2e_tests_on_pull_request.yml
deleted file mode 100644
index ce2a23ec6..000000000
--- a/.github/workflows/e2e_tests_on_pull_request.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: E2E Tests
-
-on:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-
-  DevTests:
-    uses: ./.github/workflows/testing_dev.yml
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-  LiveServices:
-    uses: ./.github/workflows/testing_dev_with_live_services.yml
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      DANDI_STAGING_API_KEY: ${{ secrets.DANDI_STAGING_API_KEY }}