Skip to content

Commit

Permalink
Remove merge queue setup, add tests to post merge
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 660541106
  • Loading branch information
chunnienc authored and copybara-github committed Aug 7, 2024
1 parent 46e424d commit 301583b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/run_post_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
5 changes: 2 additions & 3 deletions .github/workflows/run_pre_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
name: Run Pre Merge

on:
merge_group:
pull_request:
types: [labeled]
branches: ["main"]
Expand All @@ -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:
Expand All @@ -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"
Expand Down

0 comments on commit 301583b

Please sign in to comment.