mirror of
				https://github.com/R2Northstar/Northstar
				synced 2025-10-30 23:50:52 +01:00 
			
		
		
		
	Compare commits
	
		
			9 Commits
		
	
	
		
			v1.24.7
			...
			v1.28.4-rc
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 4ac160313e | ||
|   | 8f8dc0540a | ||
|   | b8aaa68473 | ||
|   | 8306655433 | ||
|   | ec3a748de8 | ||
|   | 23dfbf1f3e | ||
|   | 8fdfdbd61a | ||
|   | 767927fb92 | ||
|   | 7a72ecffcf | 
							
								
								
									
										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 | ||||||
							
								
								
									
										10
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								.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/v12/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: | | ||||||
| @@ -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 | ||||||
|   | |||||||
| @@ -29,9 +29,9 @@ The documentation is split into three repositories: | |||||||
|  |  | ||||||
| ## Special Thanks | ## Special Thanks | ||||||
|  |  | ||||||
| Thanks to everyone that's put up with me and helped out with this project, it's been a fun passion project I've had throughout 2021 so releasing it is pretty cathartic. Specifically:  | Thanks to everyone that's put up with me and helped out with this project, it's been a fun passion project I've had throughout 2021 so releasing it is pretty cathartic. Specifically: | ||||||
|  |  | ||||||
| - Thanks to the Icepick developers for making the Icepick, I initially forked it for earlier versions of Northstar and it was a great base to experiment with stuff on before moving to the custom launcher. | - Thanks to the Icepick developers for making the Icepick, I initially forked it for earlier versions of Northstar and it was a great base to experiment with stuff on before moving to the custom launcher. | ||||||
| - Thanks to everyone on R5R team for giving me advice on some later parts of development.   | - Thanks to everyone on R5R team for giving me advice on some later parts of development. | ||||||
| - Thanks to everyone in the testing server for putting up with me and helping find bugs.   | - Thanks to everyone in the testing server for putting up with me and helping find bugs. | ||||||
| - Thanks to everyone else that's helped, gave advice, all that. | - Thanks to everyone else that's helped, gave advice, all that. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user