diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b56a0a0df..7f0db6cd9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -51,22 +51,6 @@ jobs: - Dockerfile-prebuilt - .github/workflows/wc-test-docker-prebuilt.yaml - enable-automerge: - uses: ./.github/workflows/wc-enable-auto-merge.yaml - needs: - - status-check - permissions: - contents: write # For enable automerge - pull-requests: write # For enable automerge - # "! failure() && ! cancelled()" is required. success() returns false if dependent jobs are skipped. - # https://github.com/community/community/discussions/45058 - # By default success() is used so we have to override success() by "! failure() && ! cancelled()" - if: | - ! failure() && ! cancelled() && github.event.pull_request.user.login == 'renovate[bot]' && contains(github.event.pull_request.body, ' **Automerge**: Enabled.') - secrets: - gh_app_id: ${{secrets.APP_ID}} - gh_app_private_key: ${{secrets.APP_PRIVATE_KEY}} - status-check: uses: ./.github/workflows/wc-status-check.yaml permissions: {} diff --git a/.github/workflows/wc-enable-auto-merge.yaml b/.github/workflows/wc-enable-auto-merge.yaml deleted file mode 100644 index ac5750436..000000000 --- a/.github/workflows/wc-enable-auto-merge.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: enable-auto-merge -on: - workflow_call: - secrets: - gh_app_id: - required: true - gh_app_private_key: - required: true -jobs: - enable-auto-merge: - # Enable automerge to merge pull requests from Renovate automatically. - timeout-minutes: 30 - runs-on: ubuntu-latest - permissions: {} - steps: - - uses: suzuki-shunsuke/enable-auto-merge-action@ec074392e76cd1062925255cd82a86ea1c44b6fd # v0.1.0 - with: - pr_number: ${{github.event.pull_request.number}} - merge_method: squash - github_app_id: ${{secrets.gh_app_id}} - github_app_private_key: ${{secrets.gh_app_private_key}}