From 4f7c0624be47cc6d1d42aa4eb46278642b5d3adb Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Fri, 6 Dec 2024 09:16:10 -0800
Subject: [PATCH] Don't skip post-merge tests

---
 .github/workflows/main.yml                 | 2 ++
 .github/workflows/prerelease.yml           | 2 ++
 .github/workflows/release.yml              | 2 ++
 .github/workflows/run-acceptance-tests.yml | 2 ++
 .github/workflows/test.yml                 | 2 --
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a4a34a79..4876e6f0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -89,6 +89,8 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   test:
+    if: github.event_name == 'repository_dispatch' ||
+      github.event.pull_request.head.repo.full_name == github.repository
     uses: ./.github/workflows/test.yml
     needs:
       - prerequisites
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index e1fe64ce..cd3a158b 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -71,6 +71,8 @@ jobs:
       isPrerelease: true
 
   test:
+    if: github.event_name == 'repository_dispatch' ||
+      github.event.pull_request.head.repo.full_name == github.repository
     uses: ./.github/workflows/test.yml
     needs:
       - prerequisites
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 13df39b3..b37faf05 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -77,6 +77,8 @@ jobs:
       isPrerelease: false
 
   test:
+    if: github.event_name == 'repository_dispatch' ||
+      github.event.pull_request.head.repo.full_name == github.repository
     uses: ./.github/workflows/test.yml
     needs:
       - prerequisites
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index 3815ab05..8af5bd93 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -92,6 +92,8 @@ jobs:
     uses: ./.github/workflows/lint.yml
     secrets: inherit
   test:
+    if: github.event_name == 'repository_dispatch' ||
+      github.event.pull_request.head.repo.full_name == github.repository
     uses: ./.github/workflows/test.yml
     needs:
       - prerequisites
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d6ed935c..46eaacdb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,8 +33,6 @@ env:
 
 jobs:
   test:
-    if: github.event_name == 'repository_dispatch' ||
-      github.event.pull_request.head.repo.full_name == github.repository
     name: test
     permissions:
       contents: read