mirror of
https://github.com/sourcegraph/sourcegraph.git
synced 2026-02-06 14:31:56 +00:00
workflows: remove automerge action for other automerge methods (#28993)
This commit is contained in:
parent
c7ff216a19
commit
f194c428d5
34
.github/workflows/automerge.yml
vendored
34
.github/workflows/automerge.yml
vendored
@ -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"
|
||||
11
.github/workflows/licenses-update.yml
vendored
11
.github/workflows/licenses-update.yml
vendored
@ -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
|
||||
|
||||
@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user