mirror of
				https://github.com/R2Northstar/Northstar
				synced 2025-11-02 05:10:52 +01:00 
			
		
		
		
	Compare commits
	
		
			5 Commits
		
	
	
		
			v1.26.3-rc
			...
			v1.28.0-rc
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					b8aaa68473 | ||
| 
						 | 
					8306655433 | ||
| 
						 | 
					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
 | 
				
			||||||
							
								
								
									
										6
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@@ -34,7 +34,7 @@ jobs:
 | 
				
			|||||||
          wget "https://github.com/R2Northstar/NorthstarLauncher/releases/download/${{ env.NORTHSTAR_VERSION }}/northstar-launcher.zip"
 | 
					          wget "https://github.com/R2Northstar/NorthstarLauncher/releases/download/${{ env.NORTHSTAR_VERSION }}/northstar-launcher.zip"
 | 
				
			||||||
      - name: Download DiscordRPC plugin
 | 
					      - name: Download DiscordRPC plugin
 | 
				
			||||||
        run:
 | 
					        run:
 | 
				
			||||||
          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v10/northstar-discord-rpc.zip"
 | 
					          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v11/northstar-discord-rpc.zip"
 | 
				
			||||||
      - name: Download compiled stubs
 | 
					      - name: Download compiled stubs
 | 
				
			||||||
        run:
 | 
					        run:
 | 
				
			||||||
          wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
 | 
					          wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
 | 
				
			||||||
@@ -67,12 +67,12 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
          unzip NorthstarStubs.zip -d northstar/bin/x64_dedi
 | 
					          unzip NorthstarStubs.zip -d northstar/bin/x64_dedi
 | 
				
			||||||
          unzip northstar-launcher.zip -d northstar
 | 
					          unzip northstar-launcher.zip -d northstar
 | 
				
			||||||
          rsync -avr --exclude="Northstar.Coop" --exclude=".git*" northstar-mods/. northstar/R2Northstar/mods
 | 
					          rsync -avr --exclude="Northstar.Coop" --exclude=".git*" --exclude="*.md" northstar-mods/. northstar/R2Northstar/mods
 | 
				
			||||||
      - name: Checkout Navmesh repository
 | 
					      - name: Checkout Navmesh repository
 | 
				
			||||||
        uses: actions/checkout@v4
 | 
					        uses: actions/checkout@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          repository: R2Northstar/NorthstarNavs
 | 
					          repository: R2Northstar/NorthstarNavs
 | 
				
			||||||
          ref: 'v3'
 | 
					          ref: 'v4'
 | 
				
			||||||
          path: northstar-navs
 | 
					          path: northstar-navs
 | 
				
			||||||
      - name: Navmeshes setup
 | 
					      - name: Navmeshes setup
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user