mirror of
				https://github.com/R2Northstar/Northstar
				synced 2025-11-02 05:10:52 +01:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
			v1.26.3-rc
			...
			v1.27.6-rc
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					ec3a748de8 | ||
| 
						 | 
					23dfbf1f3e | ||
| 
						 | 
					8fdfdbd61a | 
							
								
								
									
										19
									
								
								.github/workflows/merge-conflict-auto-label.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								.github/workflows/merge-conflict-auto-label.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,19 @@
 | 
			
		||||
name: Merge Conflict Auto Label
 | 
			
		||||
on:
 | 
			
		||||
  workflow_dispatch: # Manual run
 | 
			
		||||
  push:
 | 
			
		||||
    branches:
 | 
			
		||||
      - main
 | 
			
		||||
  schedule:
 | 
			
		||||
    - cron: "10 21 * * *" # Runs at 21:10; time was chosen based on contributor activity and low GitHub Actions cron load.
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  triage:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
      - uses: mschilde/auto-label-merge-conflicts@master
 | 
			
		||||
        with:
 | 
			
		||||
          CONFLICT_LABEL_NAME: "merge conflicts"
 | 
			
		||||
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 | 
			
		||||
          MAX_RETRIES: 5
 | 
			
		||||
          WAIT_MS: 5000
 | 
			
		||||
							
								
								
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@@ -72,7 +72,7 @@ jobs:
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
        with:
 | 
			
		||||
          repository: R2Northstar/NorthstarNavs
 | 
			
		||||
          ref: 'v3'
 | 
			
		||||
          ref: 'v4'
 | 
			
		||||
          path: northstar-navs
 | 
			
		||||
      - name: Navmeshes setup
 | 
			
		||||
        run: |
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user