Add files via upload (#2285)

This commit is contained in:
efb4f5ff-1298-471a-8973-3d47447115dc 2022-09-06 11:38:51 +00:00 committed by GitHub
parent 059eeab47a
commit beece01cdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 0 deletions

25
conflicts.yml Normal file
View File

@ -0,0 +1,25 @@
name: "Conflicts"
on:
# So that PRs touching the same files as the push are updated
push:
# So that the `dirtyLabel` is removed if conflicts are resolve
# We recommend `pull_request_target` so that github secrets are available.
# In `pull_request` we wouldn't be able to change labels of fork PRs
pull_request_target:
types: [synchronize]
workflow_run:
workflows: ['Dummy workflow for conflicts']
types: [requested]
jobs:
main:
runs-on: ubuntu-latest
steps:
- name: check if prs are dirty
uses: eps1lon/actions-label-merge-conflict@releases/2.x
with:
dirtyLabel: "PR: merge conflicts / rebase needed"
removeOnDirtyLabel: "PR: waiting for review"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."

9
dummy-conflicts.yml Normal file
View File

@ -0,0 +1,9 @@
name: Dummy workflow for conflicts
on:
pull_request_review:
types: [submitted]
jobs:
dummy:
runs-on: ubuntu-latest
steps:
- run: echo "this is a dummy workflow that triggers a workflow_run; it's necessary because otherwise the repo secrets will not be in scope for externally forked pull requests"