From 3133a600333a99c1904682027565dfbccfac151a Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 13 Jul 2024 20:55:12 -0400 Subject: [PATCH] Run master merge on master pushes --- .github/workflows/stable-merge.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/stable-merge.yml b/.github/workflows/stable-merge.yml index b0dd3f1015..05299e6284 100644 --- a/.github/workflows/stable-merge.yml +++ b/.github/workflows/stable-merge.yml @@ -1,10 +1,9 @@ name: 'Master Merge' on: - workflow_run: - workflows: [CI Pipeline] - types: - - completed + push: + branches: + - master workflow_dispatch: env: @@ -13,7 +12,6 @@ env: jobs: master-merge: runs-on: ubuntu-latest - if: github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') steps: - name: Checkout uses: actions/checkout@v4