mirror of
				https://github.com/R2Northstar/Northstar
				synced 2025-10-30 23:50:52 +01:00 
			
		
		
		
	Compare commits
	
		
			23 Commits
		
	
	
		
			v1.20.0
			...
			v1.30.1-rc
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | df9ff77e26 | ||
|   | 7ae04b0f32 | ||
|   | 4ac160313e | ||
|   | 8f8dc0540a | ||
|   | b8aaa68473 | ||
|   | 8306655433 | ||
|   | ec3a748de8 | ||
|   | 23dfbf1f3e | ||
|   | 8fdfdbd61a | ||
|   | 767927fb92 | ||
|   | 7a72ecffcf | ||
|   | e7e2d55c9b | ||
|   | ada52bb828 | ||
|   | 86085f5c91 | ||
|   | ad3601c607 | ||
|   | 904e6b00ef | ||
|   | 4c0f02ba4f | ||
|   | 06f551ef71 | ||
|   | ee9239f4ae | ||
|   | cfc1498753 | ||
|   | abf59ba5fe | ||
|   | 05a32ee30e | ||
|   | e595fa0a83 | 
							
								
								
									
										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 | ||||||
							
								
								
									
										7
									
								
								.github/workflows/post-to-mastodon.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/post-to-mastodon.yml
									
									
									
									
										vendored
									
									
								
							| @@ -9,9 +9,8 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - name: Send toot to Mastodon |       - name: Send toot to Mastodon | ||||||
|         id: mastodon |         id: mastodon | ||||||
|         uses: cbrgm/mastodon-github-action@v1 |         uses: cbrgm/mastodon-github-action@v2 | ||||||
|         with: |         with: | ||||||
|           message: "We just released Northstar ${{ github.event.release.tag_name }}\n\n${{ github.event.release.html_url }}" |           message: "We just released Northstar ${{ github.event.release.tag_name }}\n\n${{ github.event.release.html_url }}" | ||||||
|         env: |           url: ${{ secrets.MASTODON_URL }} | ||||||
|           MASTODON_URL: ${{ secrets.MASTODON_URL }} |           access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }} | ||||||
|           MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }} |  | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| name: Build | name: Release | ||||||
| on: | on: | ||||||
|   push: |   push: | ||||||
|     tags: |     tags: | ||||||
| @@ -15,13 +15,14 @@ permissions: | |||||||
|  |  | ||||||
| env: | env: | ||||||
|   NORTHSTAR_VERSION: ${{ github.ref_name }} |   NORTHSTAR_VERSION: ${{ github.ref_name }} | ||||||
|  |   DISCORD_RPC_VERSION: v13 | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   build-northstar: |   build-northstar: | ||||||
|     runs-on: ubuntu-20.04 |     runs-on: ubuntu-22.04 | ||||||
|     steps: |     steps: | ||||||
|       - name: Checkout release files |       - name: Checkout release files | ||||||
|         uses: actions/checkout@v3 |         uses: actions/checkout@v4 | ||||||
|         with: |         with: | ||||||
|           ref: ${{ env.NORTHSTAR_VERSION }} |           ref: ${{ env.NORTHSTAR_VERSION }} | ||||||
|           path: northstar |           path: northstar | ||||||
| @@ -34,19 +35,19 @@ 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/v5/northstar-discord-rpc.zip" |           wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/${{ env.DISCORD_RPC_VERSION }}/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" | ||||||
|       - name: Checkout core mods |       - name: Checkout core mods | ||||||
|         uses: actions/checkout@v3 |         uses: actions/checkout@v4 | ||||||
|         with: |         with: | ||||||
|           repository: R2Northstar/NorthstarMods |           repository: R2Northstar/NorthstarMods | ||||||
|           ref: ${{ env.NORTHSTAR_VERSION }} |           ref: ${{ env.NORTHSTAR_VERSION }} | ||||||
|           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 | ||||||
| @@ -57,34 +58,34 @@ jobs: | |||||||
|           git ls-tree -r $NORTHSTAR_VERSION --name-only | xargs -L1 md5sum >> md5sum.txt |           git ls-tree -r $NORTHSTAR_VERSION --name-only | xargs -L1 md5sum >> md5sum.txt | ||||||
|       - name: Make folder structure |       - name: Make folder structure | ||||||
|         run: | |         run: | | ||||||
|           mv -v northstar/release/* northstar/. |           mv --verbose northstar/release/* northstar/. | ||||||
|           rm -d northstar/release |           rm --dir northstar/release | ||||||
|           mkdir -p northstar/R2Northstar/mods |           mkdir --parents northstar/R2Northstar/mods | ||||||
|           mkdir -p northstar/R2Northstar/plugins |           mkdir --parents northstar/R2Northstar/plugins | ||||||
|           mkdir -p northstar/bin/x64_dedi |           mkdir --parents northstar/bin/x64_dedi | ||||||
|  |  | ||||||
|           unzip northstar-discord-rpc.zip -d northstar/R2Northstar/plugins |           unzip northstar-discord-rpc.zip -d northstar/R2Northstar/plugins | ||||||
|  |  | ||||||
|           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@v3 |         uses: actions/checkout@v4 | ||||||
|         with: |         with: | ||||||
|           repository: R2Northstar/NorthstarNavs |           repository: R2Northstar/NorthstarNavs | ||||||
|           ref: 'v2' |           ref: 'v4' | ||||||
|           path: northstar-navs |           path: northstar-navs | ||||||
|       - name: Navmeshes setup |       - name: Navmeshes setup | ||||||
|         run: | |         run: | | ||||||
|           mkdir -p northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps |           mkdir --parents northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps | ||||||
|           mv -v northstar-navs/graphs northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps |           mv --verbose northstar-navs/graphs northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps | ||||||
|           mv -v northstar-navs/navmesh northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps |           mv --verbose northstar-navs/navmesh northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps | ||||||
|       - name: Cleanup root Northstar repository files |       - name: Cleanup root Northstar repository files | ||||||
|         working-directory: northstar |         working-directory: northstar | ||||||
|         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 | ||||||
| @@ -96,8 +97,11 @@ jobs: | |||||||
|       - name: Compute SHA-512 checksum |       - name: Compute SHA-512 checksum | ||||||
|         run: | |         run: | | ||||||
|           sha512sum Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip |           sha512sum Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip | ||||||
|  |           echo "\`\`\`" >> $GITHUB_STEP_SUMMARY | ||||||
|  |           sha512sum Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip >> $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 | ||||||
| @@ -118,33 +122,33 @@ jobs: | |||||||
|       TS_NAMESPACE: northstar |       TS_NAMESPACE: northstar | ||||||
|       TS_MOD_NAME: Northstar |       TS_MOD_NAME: Northstar | ||||||
|       TS_MOD_DESCRIPTION: Titanfall 2 modding and custom server framework. |       TS_MOD_DESCRIPTION: Titanfall 2 modding and custom server framework. | ||||||
|     runs-on: ubuntu-20.04 |     runs-on: ubuntu-22.04 | ||||||
|     steps: |     steps: | ||||||
|       - name: Setup tcli |       - name: Setup tcli | ||||||
|         run: | |         run: | | ||||||
|           wget -O tcli.tar.gz https://github.com/thunderstore-io/thunderstore-cli/releases/download/0.1.4/tcli-0.1.4-linux-x64.tar.gz |           wget --output-document tcli.tar.gz https://github.com/thunderstore-io/thunderstore-cli/releases/download/0.1.4/tcli-0.1.4-linux-x64.tar.gz | ||||||
|           tar xvf tcli.tar.gz |           tar xvf tcli.tar.gz | ||||||
|           sudo mv -v tcli-0.1.4-linux-x64/tcli /bin |           sudo mv --verbose tcli-0.1.4-linux-x64/tcli /bin | ||||||
|  |  | ||||||
|       - name: (DEBUG) Download Northstar package |       - name: (DEBUG) Download Northstar package | ||||||
|         if: ${{ env.ACT }} # Download Northstar package from releases when running locally instead of relying on previous jobs |         if: ${{ env.ACT }} # Download Northstar package from releases when running locally instead of relying on previous jobs | ||||||
|         run: | |         run: | | ||||||
|           wget -O northstar.zip https://github.com/R2Northstar/Northstar/releases/download/v1.6.3/Northstar.release.v1.6.3.zip |           wget --output-document northstar.zip https://github.com/R2Northstar/Northstar/releases/download/v1.6.3/Northstar.release.v1.6.3.zip | ||||||
|           unzip northstar.zip -d northstar |           unzip northstar.zip -d northstar | ||||||
|  |  | ||||||
|       - 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 | ||||||
|  |  | ||||||
|       - name: Make package structure |       - name: Make package structure | ||||||
|         run: | |         run: | | ||||||
|           mkdir -p thunderstore/dist/Northstar |           mkdir --parents thunderstore/dist/Northstar | ||||||
|           mv -v northstar/* thunderstore/dist/Northstar |           mv --verbose northstar/* thunderstore/dist/Northstar | ||||||
|           wget -O thunderstore/icon.png https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/icon.png |           wget --output-document thunderstore/icon.png https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/icon.png | ||||||
|           wget -O thunderstore/README.md https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/README.md |           wget --output-document thunderstore/README.md https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/README.md | ||||||
|  |  | ||||||
|       - name: Setup environment variables |       - name: Setup environment variables | ||||||
|         run: | |         run: | | ||||||
| @@ -167,9 +171,9 @@ jobs: | |||||||
|         run: | |         run: | | ||||||
|           tcli init --package-name=$TS_MOD_NAME --package-namespace=$TS_NAMESPACE --package-version $MOD_VERSION |           tcli init --package-name=$TS_MOD_NAME --package-namespace=$TS_NAMESPACE --package-version $MOD_VERSION | ||||||
|  |  | ||||||
|           sed -i "s/communities = \[\]/communities = [\"$TS_COMMUNITY\"]/g" thunderstore.toml |           sed --in-place "s/communities = \[\]/communities = [\"$TS_COMMUNITY\"]/g" thunderstore.toml | ||||||
|           sed -i "s/Example-Dependency = \"1.0.0\"//g" thunderstore.toml |           sed --in-place "s/Example-Dependency = \"1.0.0\"//g" thunderstore.toml | ||||||
|           sed -i "s/description = \"Example mod description\"/description = \"$TS_MOD_DESCRIPTION\"/g" thunderstore.toml |           sed --in-place "s/description = \"Example mod description\"/description = \"$TS_MOD_DESCRIPTION\"/g" thunderstore.toml | ||||||
|           cat thunderstore.toml |           cat thunderstore.toml | ||||||
|  |  | ||||||
|           tcli build |           tcli build | ||||||
| @@ -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