diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8b6665f..63e924b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -61,8 +61,10 @@ jobs: configuration-path: .github/auto_label.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: pascalgn/automerge-action@v0.16.4 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MERGE_LABELS: "automerge,!WIP,!do-not-merge" - MERGE_METHOD: squash + - run: echo "automerge=$(gh api repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels | jq -r '.[].name' | grep -qw 'automerge' && echo true || echo false)" >> $GITHUB_ENV + - uses: daneden/enable-automerge-action@v1.0.2 + if: env.automerge == 'true' + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + allowed-author: "dependabot[bot]" + merge-method: SQUASH