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

.github/workflows/build.yml

@@ -35,7 +35,7 @@ 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:]')
+          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
@@ -101,16 +101,28 @@ 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:
@@ -137,12 +149,12 @@ jobs:
     steps:
       - name: Setup tcli
         run: |
-          wget https://github.com/thunderstore-io/thunderstore-cli/releases/download/0.1.4/tcli-0.1.4-linux-x64.tar.gz
-          tar xvf tcli-0.1.4-linux-x64.tar.gz
-          mv -v tcli-0.1.4-linux-x64/tcli /bin
+          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 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: |
           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

release/r2ds.bat

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