Strip rc suffix from version number properly (#268)

Previously the digit of the rc as well as the dash would remain
E.g.: `-rc2` -> `-2`
This resulted in it being subtracted from the patch version digit
E.g.: `v1.7.0-rc1` turns into `1,7,0-1`.

This commit strips the whole `-rcX` part of the version number in CI

Closes #265

.ci.env.example

@@ -0,0 +1,11 @@
+# Env file to use with https://github.com/nektos/act to run GitHub Actions locally when debugging
+#
+# Ex:
+# act --env-file .env -j build-thunderstore-package
+#
+# Reference:
+# https://github.com/thunderstore-io/thunderstore-cli/wiki
+
+TCLI_AUTH_TOKEN=
+TS_COMMUNITY=test
+TS_REPO=https://thunderstore.dev/

.github/workflows/build.yml

@@ -3,6 +3,12 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+    inputs:
+      job:
+        description: 'Job to run'
+        required: true
+        default: 'build-thunderstore-package'
 
 env:
   NORTHSTAR_VERSION: ${{ github.ref_name }}
@@ -29,10 +35,10 @@ jobs:
         working-directory: northstar-launcher
         run: |
           sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' LauncherInjector/resources.rc
-          FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | tr -d '[:alpha:]')
-          sed -i "s/0,0,0,1/${FILEVERSION}/g" LauncherInjector/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" NorthstarDedicatedTest/ns_version.h
       - name: Build
-        working-directory: northstar-launcher 
+        working-directory: northstar-launcher
         run: |
           cp -r ../discord-plugin/*Discord* .
           msbuild /p:Configuration=Release R2Northstar.sln
@@ -95,18 +101,92 @@ jobs:
           mkdir -p northstar/R2Northstar/mods
           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
           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: Cleanup
+      - name: Checkout Navmesh repository
+        uses: actions/checkout@v2
+        with:
+          repository: R2Northstar/NorthstarNavs
+          path: northstar-navs
+      - name: Navmeshes setup
         run: |
-          rm -rf northstar-launcher
-          cd northstar && rm -rf .git .github *.md LICENSE
+          mkdir -p northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mv -v northstar-navs/graphs northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mv -v northstar-navs/navmesh northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+      - name: Cleanup root Northstar repository files
+        working-directory: northstar
+        run: |
+          rm -rf .git .github .gitignore *.md LICENSE thunderstore .ci.env.example
       - name: Upload
         uses: actions/upload-artifact@v2
         with:
           name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
           path: northstar
+
+  build-thunderstore-package:
+    needs: build-northstar # comment out when running locally
+    if: "!contains(github.ref, 'rc')" # Skip uploading release candidates to Thunderstore
+    env:
+      # Release envs, comment this out when running locally
+      TCLI_AUTH_TOKEN: ${{ secrets.THUNDERSTORE_TOKEN }}
+      TS_REPO: https://thunderstore.io/
+      TS_COMMUNITY: northstar
+
+      # Uncomment when testing locally, must be unique
+      # NORTHSTAR_VERSION: 0.1.8
+
+      # Thunderstore info and descriptions
+      TS_NAMESPACE: northstar
+      TS_MOD_NAME: Northstar
+      TS_MOD_DESCRIPTION: Titanfall 2 modding and custom server framework.
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Setup tcli
+        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
+          tar xvf tcli.tar.gz
+          sudo mv -v tcli-0.1.4-linux-x64/tcli /bin
+
+      - name: (DEBUG) Download Northstar package
+        if: ${{ env.ACT }} # Download Northstar package from releases when running locally instead of relying on previous jobs
+        run: |
+          wget -O northstar.zip https://github.com/R2Northstar/Northstar/releases/download/v1.6.3/Northstar.release.v1.6.3.zip
+          unzip northstar.zip -d northstar
+
+      - name: Download Northstar package
+        if: ${{ !env.ACT }} # Download artifacts from previous jobs when running on GitHub's infrastructure
+        uses: actions/download-artifact@v2
+        with:
+          name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
+          path: northstar
+
+      - 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
+
+      - name: Setup environment variables
+        run: |
+          echo "MOD_VERSION=$(echo $NORTHSTAR_VERSION | tr -d 'v')" >> $GITHUB_ENV
+
+      - name: Publish package to Thunderstore
+        working-directory: thunderstore
+        run: |
+          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 -i "s/Example-Dependency = \"1.0.0\"//g" thunderstore.toml
+          sed -i "s/description = \"Example mod description\"/description = \"$TS_MOD_DESCRIPTION\"/g" thunderstore.toml
+          cat thunderstore.toml
+
+          tcli build
+          tcli publish --repository "$TS_REPO" --file build/*.zip

.gitignore

@@ -0,0 +1 @@
+.env

release/r2ds.bat

@@ -0,0 +1 @@
+NorthstarLauncher.exe -dedicated -multiple

thunderstore/README.md

@@ -0,0 +1,29 @@
+# Northstar
+
+Northstar is a modding framework client that allows users to host their own Titanfall 2 servers using custom scripts and assets to create custom content, as well as being able to host vanilla content.
+
+# Manual Install
+
+Firstly, note that the Northstar client is only available on PC and
+requires you to **both own the game and have it installed.**
+
+1.  Download the zip with the "Manual Download" button
+2.  Copy the files from inside the "Northstar" folder from the zip to your game folder. This can vary depending on whether you purchased the game off Steam or Origin, and if you set a custom folder for game installs.
+    - **For Steam** - Right click _Titanfall 2 \> Properties \> Local Files \> Browse_  
+      Usually: `C:\Program Files (x86)\Steam\steamapps\common\Titanfall2`
+    - **For Origin** - To find the location of your Origin library go to _Origin -\> Application Setting -\> Installs & Saves -\> On your Computer -\> Game Library Location_  
+      Go to the directory mentioned there using File Explorer and open the `Titanfall2` folder.  
+      Usually: `C:\Program Files (x86)\Origin Games\Titanfall2`
+    - **For EA App** - To find the location of your EA library go to _Settings -\> Download_  
+      Go to the directory under "Install location" using File Explorer and open the `Titanfall2` folder.  
+      Usually: `C:\Program Files\EA Games\Titanfall2`
+3.  Launch `NorthstarLauncher.exe` to start Northstar
+    - After launching for the first time, you'll be greeted with a popup requesting to authenticate to the master server. Click Yes (This can be changed in the mods menu later if desired)
+4.  Select _Launch Northstar_
+5.  From the multiplayer menu, you can use the server browser to select and join any of the public community hosted servers.
+
+# Links
+
+[Discord](https://northstar.tf/discord)  
+[GitHub](https://northstar.tf/github)  
+[Wiki](https://northstar.tf/wiki)