From 2a272a5925ef1ed47a416ee8aa0653af3b6dbf17 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Mon, 17 Aug 2020 09:09:05 -0500 Subject: [PATCH] adding more logic --- .github/workflows/automerge-dependabot.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automerge-dependabot.yml b/.github/workflows/automerge-dependabot.yml index e00b6c22..ff106ad2 100644 --- a/.github/workflows/automerge-dependabot.yml +++ b/.github/workflows/automerge-dependabot.yml @@ -37,8 +37,16 @@ jobs: checkName: Deploy Docker Image - DEV ref: ${{ github.event.pull_request.head.sha || github.sha }} + - name: Wait for CI/CT/CD to succeed pt2 + uses: fountainhead/action-wait-for-check@v1.0.0 + id: wait-for-ci + with: + token: ${{ secrets.GITHUB_TOKEN }} + checkName: Stack linter + ref: ${{ github.event.pull_request.head.sha || github.sha }} + - name: merge - if: steps.wait-for-build.outputs.conclusion == 'success' || steps.wait-for-build.outputs.conclusion == 'skipped' + if: steps.wait-for-build.outputs.conclusion == 'success' || steps.wait-for-build.outputs.conclusion == 'skipped' && steps.wait-for-ci.outputs.conclusion == 'success' uses: actions/github-script@v2 with: script: |