diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 008c31c3..7625834e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,3 +2,8 @@ # These owners will be the default owners for everything in the repo # ###################################################################### * @admiralawkbar @jwiebalk @zkoppert @IAmHughes @nemchik @Hanse00 + +#################################################### +# Adding dependabot for auto merge on dependancies # +#################################################### +* @dependabot[bot] diff --git a/.github/workflows/automerge-dependabot.yml b/.github/workflows/automerge-dependabot.yml index 5caaa35e..32eb70a6 100644 --- a/.github/workflows/automerge-dependabot.yml +++ b/.github/workflows/automerge-dependabot.yml @@ -29,7 +29,16 @@ jobs: runs-on: ubuntu-latest if: github.actor == 'dependabot[bot]' steps: + - name: Wait for CI/CT/CD to succeed + uses: fountainhead/action-wait-for-check@v1.0.0 + id: wait-for-build + with: + token: ${{ secrets.GITHUB_TOKEN }} + checkName: Deploy Docker Image - DEV + ref: ${{ github.event.pull_request.head.sha || github.sha }} + - name: merge + if: steps.wait-for-build.outputs.conclusion == 'success' uses: actions/github-script@v2 with: script: |