mirror of
				https://github.com/R2Northstar/Northstar
				synced 2025-11-02 05:10:52 +01:00 
			
		
		
		
	Compare commits
	
		
			11 Commits
		
	
	
		
			v1.24.6-rc
			...
			v1.28.5-rc
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					7ae04b0f32 | ||
| 
						 | 
					4ac160313e | ||
| 
						 | 
					8f8dc0540a | ||
| 
						 | 
					b8aaa68473 | ||
| 
						 | 
					8306655433 | ||
| 
						 | 
					ec3a748de8 | ||
| 
						 | 
					23dfbf1f3e | ||
| 
						 | 
					8fdfdbd61a | ||
| 
						 | 
					767927fb92 | ||
| 
						 | 
					7a72ecffcf | ||
| 
						 | 
					e7e2d55c9b | 
							
								
								
									
										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
 | 
				
			||||||
							
								
								
									
										14
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								.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/v9/northstar-discord-rpc.zip"
 | 
					          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v13/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"
 | 
				
			||||||
@@ -46,7 +46,7 @@ jobs:
 | 
				
			|||||||
          path: northstar-mods
 | 
					          path: northstar-mods
 | 
				
			||||||
      - name: Update mod version info
 | 
					      - name: Update mod version info
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          export MOD_VERSION=$(echo $NORTHSTAR_VERSION | tr -d 'v')
 | 
					          export MOD_VERSION=$(echo $NORTHSTAR_VERSION | tr --delete 'v')
 | 
				
			||||||
          cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Client/mod.json) > northstar-mods/Northstar.Client/mod.json
 | 
					          cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Client/mod.json) > northstar-mods/Northstar.Client/mod.json
 | 
				
			||||||
          cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Custom/mod.json) > northstar-mods/Northstar.Custom/mod.json
 | 
					          cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Custom/mod.json) > northstar-mods/Northstar.Custom/mod.json
 | 
				
			||||||
          cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.CustomServers/mod.json) > northstar-mods/Northstar.CustomServers/mod.json
 | 
					          cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.CustomServers/mod.json) > northstar-mods/Northstar.CustomServers/mod.json
 | 
				
			||||||
@@ -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: |
 | 
				
			||||||
@@ -84,7 +84,7 @@ jobs:
 | 
				
			|||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          rm -rf .git .github .gitignore *.md LICENSE thunderstore .ci.env.example *.sh
 | 
					          rm -rf .git .github .gitignore *.md LICENSE thunderstore .ci.env.example *.sh
 | 
				
			||||||
      - name: Upload
 | 
					      - name: Upload
 | 
				
			||||||
        uses: actions/upload-artifact@v3
 | 
					        uses: actions/upload-artifact@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
 | 
					          name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
 | 
				
			||||||
          path: northstar
 | 
					          path: northstar
 | 
				
			||||||
@@ -100,7 +100,7 @@ jobs:
 | 
				
			|||||||
          sha512sum Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip >> $GITHUB_STEP_SUMMARY
 | 
					          sha512sum Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip >> $GITHUB_STEP_SUMMARY
 | 
				
			||||||
          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
 | 
					          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
 | 
				
			||||||
      - name: Upload zip to release draft
 | 
					      - name: Upload zip to release draft
 | 
				
			||||||
        uses: softprops/action-gh-release@v1
 | 
					        uses: softprops/action-gh-release@v2
 | 
				
			||||||
        if: startsWith(github.ref, 'refs/tags/v') && !contains(env.NORTHSTAR_VERSION, '-rc')
 | 
					        if: startsWith(github.ref, 'refs/tags/v') && !contains(env.NORTHSTAR_VERSION, '-rc')
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          draft: true
 | 
					          draft: true
 | 
				
			||||||
@@ -137,7 +137,7 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
      - name: Download Northstar package
 | 
					      - name: Download Northstar package
 | 
				
			||||||
        if: ${{ !env.ACT }} # Download artifacts from previous jobs when running on GitHub's infrastructure
 | 
					        if: ${{ !env.ACT }} # Download artifacts from previous jobs when running on GitHub's infrastructure
 | 
				
			||||||
        uses: actions/download-artifact@v3
 | 
					        uses: actions/download-artifact@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
 | 
					          name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
 | 
				
			||||||
          path: northstar
 | 
					          path: northstar
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user