mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-11-04 00:02:37 +01:00 
			
		
		
		
	
		
			
				
	
	
		
			45 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			YAML
		
	
	
	
	
	
			
		
		
	
	
			45 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			YAML
		
	
	
	
	
	
# Licensed to the Apache Software Foundation (ASF) under one
 | 
						|
# or more contributor license agreements.  See the NOTICE file
 | 
						|
# distributed with this work for additional information
 | 
						|
# regarding copyright ownership.  The ASF licenses this file
 | 
						|
# to you under the Apache License, Version 2.0 (the
 | 
						|
# "License"); you may not use this file except in compliance
 | 
						|
# with the License.  You may obtain a copy of the License at
 | 
						|
#
 | 
						|
#   http://www.apache.org/licenses/LICENSE-2.0
 | 
						|
#
 | 
						|
# Unless required by applicable law or agreed to in writing,
 | 
						|
# software distributed under the License is distributed on an
 | 
						|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 | 
						|
# KIND, either express or implied.  See the License for the
 | 
						|
# specific language governing permissions and limitations
 | 
						|
# under the License.
 | 
						|
 | 
						|
name: "PR Merge Conflict Check"
 | 
						|
on:
 | 
						|
  push:
 | 
						|
  pull_request_target:
 | 
						|
    types: [synchronize]
 | 
						|
 | 
						|
permissions:  # added using https://github.com/step-security/secure-workflows
 | 
						|
  contents: read
 | 
						|
 | 
						|
concurrency:
 | 
						|
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
 | 
						|
  cancel-in-progress: true
 | 
						|
 | 
						|
jobs:
 | 
						|
  triage:
 | 
						|
    permissions:
 | 
						|
      pull-requests: write  # for eps1lon/actions-label-merge-conflict to label PRs
 | 
						|
    runs-on: ubuntu-22.04
 | 
						|
    steps:
 | 
						|
    - name: Conflict Check
 | 
						|
      uses: eps1lon/actions-label-merge-conflict@v2.0.0
 | 
						|
      with:
 | 
						|
        repoToken: "${{ secrets.GITHUB_TOKEN }}"
 | 
						|
        dirtyLabel: "status:has-conflicts"
 | 
						|
        removeOnDirtyLabel: "status:ready-for-review"
 | 
						|
        continueOnMissingPermissions: true
 | 
						|
        commentOnDirty: "This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch."
 |