From 301583bc7fbc6df2e5c12cbc83c925cce1e28c9f Mon Sep 17 00:00:00 2001
From: Chun-nien Chan <cnchan@google.com>
Date: Wed, 7 Aug 2024 14:32:27 -0700
Subject: [PATCH] Remove merge queue setup, add tests to post merge

PiperOrigin-RevId: 660541106
---
 .github/workflows/run_post_merge.yml | 12 ++++++++++++
 .github/workflows/run_pre_merge.yml  |  5 ++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/run_post_merge.yml b/.github/workflows/run_post_merge.yml
index 0cf0fb3..1005fbc 100644
--- a/.github/workflows/run_post_merge.yml
+++ b/.github/workflows/run_post_merge.yml
@@ -16,3 +16,15 @@ jobs:
     secrets: inherit
     with:
       trigger-sha: ${{ github.event.after }}
+
+  run-generative-api-examples:
+    name: Generative API Examples
+    uses: ./.github/workflows/generative_api_examples.yml
+    with:
+      trigger-sha: ${{ github.event.after }}
+
+  run-unittests-python:
+    name: Unit Tests Python
+    uses: ./.github/workflows/unittests_python.yml
+    with:
+      trigger-sha: ${{ github.event.after }}
diff --git a/.github/workflows/run_pre_merge.yml b/.github/workflows/run_pre_merge.yml
index c655c72..eabb305 100644
--- a/.github/workflows/run_pre_merge.yml
+++ b/.github/workflows/run_pre_merge.yml
@@ -4,7 +4,6 @@
 name: Run Pre Merge
 
 on:
-  merge_group:
   pull_request:
     types: [labeled]
     branches: ["main"]
@@ -25,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: fail-without-ci_run
-        if: ${{ (github.event.action == 'labeled') && !(contains(github.event.pull_request.labels.*.name, 'ci:run')) }}
+        if: ${{ !(contains(github.event.pull_request.labels.*.name, 'ci:run')) }}
         run: exit 1
 
   remove-ci-run-label:
@@ -52,7 +51,7 @@ jobs:
     name: Check PR description has BUG=
     steps:
       - name: Check for BUG=
-        if: ${{ (github.event.action == 'labeled') && !contains(github.event.pull_request.body, 'BUG=') }}
+        if: ${{ !contains(github.event.pull_request.body, 'BUG=') }}
         run: |
             echo "PR description requires a BUG= line with issue number."
             echo "See https://testing.googleblog.com/2017/09/code-health-providing-context-with.html for additional context"