workflows: remove automerge action for other automerge methods (#28993)

This commit is contained in:
Robert Lin 2021-12-14 08:52:57 -08:00 committed by GitHub
parent c7ff216a19
commit f194c428d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 37 deletions

View File

@ -1,34 +0,0 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: Automerge
uses: pascalgn/automerge-action@v0.12.0
env:
MERGE_LABELS: automerge
MERGE_METHOD: squash
MERGE_RETRIES: 1
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
with:
args: "--trace"

View File

@ -29,8 +29,9 @@ jobs:
- name: Preview report diff
run: git --no-pager diff
- name: Open pull request
- name: Create pull request
uses: peter-evans/create-pull-request@v3
id: cpr
with:
labels: automerge
base: main
@ -47,3 +48,11 @@ jobs:
# currently @sourcegraph-bot cross-repo-github-actions in 1password
# configure in https://github.com/sourcegraph/sourcegraph/settings/secrets/GH_REPO_TOKEN
token: ${{ secrets.GH_REPO_TOKEN }}
- name: Enable pull request automerge
if: steps.cpr.outputs.pull-request-operation == 'created'
uses: peter-evans/enable-pull-request-automerge@v1
with:
token: ${{ secrets.GH_REPO_TOKEN }}
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
merge-method: squash

View File

@ -1,7 +1,7 @@
{
"$schema": "http://json.schemastore.org/renovate",
"extends": ["github>sourcegraph/renovate-config"],
"semanticCommits": false,
"semanticCommits": "disabled",
"rebaseWhen": "never",
"packageRules": [
{
@ -27,7 +27,7 @@
"packagePatterns": ["^alpine:3.12"],
"fileMatch": ["^Dockerfile$"],
"paths": ["docker-images/**"],
"labels": ["automerge"]
"automerge": true
}
]
}