Merge fde7035e68 into 07eea0f484
				
					
				
			This commit is contained in:
		
						commit
						2a7c35df8d
					
				
							
								
								
									
										21
									
								
								.github/workflows/pr-conflicts-tagger.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								.github/workflows/pr-conflicts-tagger.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,21 @@ | |||||||
|  | name: "Pull Requests Merge Conflicts Tagger" | ||||||
|  | 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] | ||||||
|  | 
 | ||||||
|  | jobs: | ||||||
|  |   main: | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     steps: | ||||||
|  |       - name: check if prs are dirty | ||||||
|  |         uses: eps1lon/actions-label-merge-conflict@v3 | ||||||
|  |         with: | ||||||
|  |           dirtyLabel: "PR: needs rebase" | ||||||
|  |           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." | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user