Update DiscordRPC to v4 (#460 )

Requires plugins v2.
Bump download-artifact action to v3 (#447 )
2025-10-30 23:50:52 +01:00 · 2023-04-22 03:11:46 +02:00 · 2023-04-07 17:34:36 +02:00 · 2023-03-13 20:31:01 +01:00 · 2023-03-07 21:34:17 +01:00 · 2022-12-03 01:31:24 +01:00
4 changed files with 34 additions and 26 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,9 @@ on:
        required: true
        default: 'build-thunderstore-package'

+permissions:
+  contents: write # Needed to write to GitHub draft release
+
 env:
  NORTHSTAR_VERSION: ${{ github.ref_name }}

@@ -17,13 +20,8 @@ jobs:
  build-launcher:
    runs-on: windows-2022
    steps:
-      - name: Setup bundled plugins
-        uses: actions/checkout@v2
-        with:
-          repository: R2Northstar/NorthstarDiscordRPC
-          path: discord-plugin
      - name: Checkout launcher repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          repository: R2Northstar/NorthstarLauncher
          ref: ${{ env.NORTHSTAR_VERSION }}
@@ -37,25 +35,21 @@ jobs:
          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc
          FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
          sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h
-      - name: Build
+      - name: Build Launcher
        working-directory: northstar-launcher
        run: |
-          cp -r ../discord-plugin/*Discord* .
          msbuild /p:Configuration=Release R2Northstar.sln
-          msbuild /p:Configuration=Release NorthstarDiscordRPC.sln
      - name: Upload launcher build as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: northstar-launcher
          path: |
            northstar-launcher/x64/Release/Northstar.dll
            northstar-launcher/x64/Release/wsock32.dll
            northstar-launcher/x64/Release/NorthstarLauncher.exe
-            northstar-launcher/x64/Release/discord_game_sdk.dll
-            northstar-launcher/x64/Release/DiscordRPC.dll
            northstar-launcher/x64/Release/*.txt
      - name: Upload debug build artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: launcher-debug-files
          path: |
@@ -66,20 +60,23 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Download compiled launcher
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
        with:
          name: northstar-launcher
          path: northstar-launcher
+      - name: Download DiscordRPC plugin
+        run:
+          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v4/northstar-discord-rpc.zip"
      - name: Download compiled stubs
        run:
          wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
      - name: Checkout release files
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          ref: ${{ env.NORTHSTAR_VERSION }}
          path: northstar
      - name: Checkout core mods
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          repository: R2Northstar/NorthstarMods
          ref: ${{ env.NORTHSTAR_VERSION }}
@@ -102,17 +99,19 @@ jobs:
          mkdir -p northstar/R2Northstar/plugins
          mkdir -p northstar/bin/x64_retail

-          mv -v northstar-launcher/DiscordRPC.dll northstar/R2Northstar/plugins
-          mv -v northstar-launcher/discord_game_sdk.dll northstar
+          unzip northstar-discord-rpc.zip
+          mv -v DiscordRPC.dll northstar/R2Northstar/plugins
+
          mv -v northstar-launcher/wsock32.dll northstar/bin/x64_retail
          unzip NorthstarStubs.zip -d northstar/bin/x64_dedi

          mv -v northstar-launcher/* northstar
          rsync -avr --exclude="Northstar.Coop" --exclude=".git*" northstar-mods/. northstar/R2Northstar/mods
      - name: Checkout Navmesh repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          repository: R2Northstar/NorthstarNavs
+          ref: 'v1'
          path: northstar-navs
      - name: Navmeshes setup
        run: |
@@ -124,10 +123,21 @@ jobs:
        run: |
          rm -rf .git .github .gitignore *.md LICENSE thunderstore .ci.env.example
      - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
          path: northstar
+      - name: Create zip to upload
+        run: |
+          cd northstar/
+          zip --recurse-paths --quiet Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip .
+          mv Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip ../
+      - name: Upload zip to release draft
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/v') && !contains(env.NORTHSTAR_VERSION, '-rc')
+        with:
+          draft: true
+          files: Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip

  build-thunderstore-package:
    needs: build-northstar # comment out when running locally
@@ -160,7 +170,7 @@ jobs:

      - name: Download Northstar package
        if: ${{ !env.ACT }} # Download artifacts from previous jobs when running on GitHub's infrastructure
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
        with:
          name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
          path: northstar
@@ -168,7 +178,6 @@ jobs:
      - name: Make package structure
        run: |
          mkdir -p thunderstore/dist/Northstar
-          rm northstar/ns_startup*.txt
          mv -v northstar/* thunderstore/dist/Northstar
          wget -O 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
@@ -176,7 +185,7 @@ jobs:
      - name: Setup environment variables
        run: |
          # Strip leading `v` and if exists replace `-rc` with `0` and strip leading zeroes from last semver digit if necessary
-          echo "MOD_VERSION=$(echo $NORTHSTAR_VERSION | tr -d 'v'| sed --expression 's/-rc/0/' | sed -E 's/([0-9])\.([0-9])\.(0*)([0-9])/\1.\2.\4/;')" >> $GITHUB_ENV
+          echo "MOD_VERSION=$(echo $NORTHSTAR_VERSION | tr -d 'v'| sed --expression 's/-rc/0/' | sed -E 's/([0-9]+)\.([0-9]+)\.(0*)([0-9])/\1.\2.\4/;')" >> $GITHUB_ENV

          # If it's a release candidate we also want to change a few things
          if [[ $NORTHSTAR_VERSION == *"-rc"* ]]; then
--- a/README.md
+++ b/README.md
@@ -13,12 +13,13 @@ Northstar is a modding framework client that allows users to host their own Tita

 ## Development

-Northstar's development is split into 4 repositories:
+Northstar's development is split into 5 repositories:

 1. [NorthstarLauncher](https://github.com/R2Northstar/NorthstarLauncher) (Code for the C++ hook DLL)
 1. [NorthstarMods](https://github.com/R2Northstar/NorthstarMods) (Code for the squirrel mods responsible for server gamelogic recreation and custom content)
 1. [NorthstarMasterServer](https://github.com/R2Northstar/NorthstarMasterServer) (Responsible for server browser, authentication and persistence)
 1. [NorthstarStubs](https://github.com/R2Northstar/NorthstarStubs) (D3D11 and GFSDK stubs for the Northstar dedicated server)
+1. [NorthstarNavs](https://github.com/R2Northstar/NorthstarNavs) (Custom navmesh files used for AI navigation)

 The documentation is split into two repositories:
 1. [NorthstarWiki](https://github.com/R2Northstar/NorthstarWiki) (Wiki covering installation, hosting and configuration of Northstar)
--- a/release/ns_startup_args.txt
+++ b/release/ns_startup_args.txt
@@ -1 +0,0 @@
-multiple
--- a/release/ns_startup_args_dedi.txt
+++ b/release/ns_startup_args_dedi.txt
@@ -1 +0,0 @@
-+setplaylist private_match
Author	SHA1	Message	Date
pg9182	aa4d230051	Update DiscordRPC to v4 (#460 ) Requires plugins v2.	2023-04-22 03:11:46 +02:00
GeckoEidechse	aeb3e5ee17	Bump download-artifact action to v3 (#447 ) v2 is being deprecated	2023-04-07 17:34:36 +02:00
GeckoEidechse	20ae5c9786	Grab pre-compiled DiscordRPC plugin (#437 ) Instead of recompiling on each release	2023-03-13 20:31:01 +01:00
GeckoEidechse	8d7b5e4515	Add step to create release draft and upload zip (#432 ) * Add step to create release draft and upload zip * Skip draft creation for release candidates * Zip folder before upload and give permission The action we use can only deal with single files, not folders * Use `env.NORTHSTAR_VERSION` * Check if tags start with `v`	2023-03-07 21:34:17 +01:00
GeckoEidechse	c6c55ff014	Use tagged version of Navmeshes (#380 ) This allows for explicit updates of NorthstarNavs	2022-12-03 01:31:24 +01:00
GeckoEidechse	fd1c3d98ea	Use tagged version of DiscordRPC (#379 ) This way builds are more reproducible as specific versions of NorthstarDiscordRPC can be set.	2022-12-02 23:16:23 +01:00
GeckoEidechse	28b5f4f99f	Update actions to newest version (#371 ) Version bump as v2 used NodeJS 12 which is being deprecated on runners.	2022-11-27 14:02:16 +01:00
F1F7Y	0ac4a964f3	Add NorthstarNavs link (#348 )	2022-10-18 14:13:28 +02:00
GeckoEidechse	f015f27561	Fix regex breaking on multi-digit version numbers (#350 ) Resolves issue with rc version number not having leading zeroes stripped	2022-10-18 02:05:48 +02:00
GeckoEidechse	bfd587df40	Delete startup args txt files (#267 ) * Delete startup args txt files As per https://github.com/R2Northstar/NorthstarLauncher/pull/99 we no longer need them. NorthstarLauncher should just auto-create them when missing. * Strip deleting `ns_startup*.txt` Files were deleted with previous commit so deleting them is no longer needed.	2022-09-14 13:11:12 +02:00