Merge branch 'develop' into fix-vhserver-crossplay-monitoring

8 months ago · 2485c44652
29 changed files with 50 additions and 41 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,4 +1,3 @@
 ---
 version: 2
 updates:
  - package-ecosystem: "github-actions"
--- a/.github/workflows/action-prettier.yml
+++ b/.github/workflows/action-prettier.yml
@ -1,5 +1,7 @@
 name: Prettier
 on:
  workflow_dispatch:
  push:
    branches:
      - "*"
@ -18,6 +20,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v5
        with:
          persist-credentials: false
      - name: Install Prettier and plugins
        run: |
--- a/.github/workflows/action-super-linter.yml
+++ b/.github/workflows/action-super-linter.yml
@ -1,4 +1,3 @@
 ---
 name: Super Linter
 on:
@ -31,6 +30,7 @@ jobs:
          # super-linter needs the full git history to get the
          # list of files that changed across commits
          fetch-depth: 0
          persist-credentials: false
      - name: Install Prettier plugins (for summary formatting)
        run: |
@ -41,9 +41,11 @@ jobs:
        env:
          # To report GitHub Actions status checks
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
          VALIDATE_JSCPD: false
          VALIDATE_SHELL_SHFMT: false
          VALIDATE_YAML_PRETTIER: false
          VALIDATE_JSON_PRETTIER: false
          VALIDATE_MARKDOWN_PRETTIER: false
          VALIDATE_NATURAL_LANGUAGE: false
          VALIDATE_SHELL_SHFMT: false
          VALIDATE_TERRAFORM_TERRASCAN: false
          VALIDATE_YAML_PRETTIER: false
--- a/.github/workflows/action-update-copyright-years-in-license-file.yml
+++ b/.github/workflows/action-update-copyright-years-in-license-file.yml
@ -1,4 +1,5 @@
 name: Update copyright year(s) in license file
 on:
  workflow_dispatch:
  schedule:
@ -15,6 +16,7 @@ jobs:
        uses: actions/checkout@v5
        with:
          fetch-depth: 0
          persist-credentials: false
      - name: Action Update License Year
        uses: FantasticFiasco/action-update-license-year@v3
        with:
--- a/lgsm/config-default/config-lgsm/cs2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cs2server/_default.cfg
@ -163,8 +163,8 @@ glibc="2.31"
 ## Game Server Directories
 systemdir="${serverfiles}/game/csgo"
-executabledir="${serverfiles}/game/bin/linuxsteamrt64"
+executabledir="${serverfiles}/game"
-executable="./cs2"
+executable="./cs2.sh"
 servercfgdir="${systemdir}/cfg"
 servercfg="${selfname}.cfg"
 servercfgdefault="server.cfg"
--- a/lgsm/config-default/config-lgsm/vintsserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/vintsserver/_default.cfg
@ -12,7 +12,7 @@
 startparameters="--dataPath ${servercfgdir}"
 ## Release Settings | https://docs.linuxgsm.com/game-servers/vintagestory#release-settings
-# Branch (stable|unstable)
+# Branch (stable|unstable|<version>)
 branch="stable"
 #### LinuxGSM Settings ####
--- a/lgsm/data/almalinux-8.csv
+++ b/lgsm/data/almalinux-8.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-21-openjdk
 vs
 wet
--- a/lgsm/data/almalinux-9.csv
+++ b/lgsm/data/almalinux-9.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-21-openjdk
 vs
 wet
--- a/lgsm/data/centos-7.csv
+++ b/lgsm/data/centos-7.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-11-openjdk
 vs
 wet
--- a/lgsm/data/centos-8.csv
+++ b/lgsm/data/centos-8.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-17-openjdk
 vs
 wet
--- a/lgsm/data/centos-9.csv
+++ b/lgsm/data/centos-9.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-17-openjdk
 vs
 wet
--- a/lgsm/data/debian-10.csv
+++ b/lgsm/data/debian-10.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-11-jre
 vs
 wet
--- a/lgsm/data/debian-11.csv
+++ b/lgsm/data/debian-11.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-11-jre
 vs
 wet
--- a/lgsm/data/debian-12.csv
+++ b/lgsm/data/debian-12.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-17-jre
 vs
 wet
--- a/lgsm/data/debian-13.csv
+++ b/lgsm/data/debian-13.csv
@ -11,7 +11,7 @@ av
 bb
 bb2,libcurl4-gnutls-dev:i386
 bd
-bf1942,libncurses5:i386,libtinfo5:i386
+bf1942,libncurses5:i386
 bfv,libncurses5:i386,libstdc++5:i386
 bmdm,libncurses5:i386
 bo
@ -31,7 +31,7 @@ cs
 cs2
 cscz
 csgo
-css,libtinfo5:i386
+css
 ct
 dab
 dayz
@ -48,7 +48,7 @@ etl
 ets2
 fctr
 fof
-gmod,libtinfo5:i386
+gmod
 hcu
 hl2dm
 hldm
@ -65,14 +65,14 @@ kf
 kf2
 l4d
 l4d2
-mc,openjdk-22-jre
+mc,openjdk-25-jre
 mcb
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
 nd
 nec
-nmrih,libtinfo5:i386
+nmrih
 ns
 ns2,speex,libtbb12
 ns2c,speex:i386,libtbb12
@ -81,12 +81,12 @@ onset,libmariadb-dev
 opfor
 pc
 pc2
-pmc,openjdk-22-jre
+pmc,openjdk-25-jre
 squad44
 pvkii
 pvr,libc++1
 pw
-pz,openjdk-22-jre,rng-tools5
+pz,openjdk-25-jre,rng-tools5
 q2
 q3
 q4
@ -96,7 +96,7 @@ ricochet
 ro
 rtcw
 rust,lib32z1
-rw,openjdk-22-jre
+rw,openjdk-25-jre
 samp
 sb
 sbots
@ -104,7 +104,7 @@ scpsl,mono-complete
 scpslsm,mono-complete
 sdtd,telnet,expect,libxml2-utils
 sf
-sfc,libtinfo5:i386
+sfc
 sm,telnet,expect
 sof2
 sol
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-21-jre
 vs
 wet
@ -135,5 +135,5 @@ wf
 wmc,openjdk21-jre
 wurm,xvfb
 xnt
-zmr,libtinfo5:i386
+zmr
-zps,libtinfo5:i386
+zps
--- a/lgsm/data/debian-9.csv
+++ b/lgsm/data/debian-9.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-8-jre
 vs
 wet
--- a/lgsm/data/rhel-7.csv
+++ b/lgsm/data/rhel-7.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-11-openjdk
 vs
 wet
--- a/lgsm/data/rhel-8.csv
+++ b/lgsm/data/rhel-8.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-21-openjdk
 vs
 wet
--- a/lgsm/data/rhel-9.csv
+++ b/lgsm/data/rhel-9.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-21-openjdk
 vs
 wet
--- a/lgsm/data/rocky-8.csv
+++ b/lgsm/data/rocky-8.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-21-openjdk
 vs
 wet
--- a/lgsm/data/rocky-9.csv
+++ b/lgsm/data/rocky-9.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-21-openjdk
 vs
 wet
--- a/lgsm/data/ubuntu-16.04.csv
+++ b/lgsm/data/ubuntu-16.04.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-8-jre
 vs
 wet
--- a/lgsm/data/ubuntu-18.04.csv
+++ b/lgsm/data/ubuntu-18.04.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-11-jre
 vs
 wet
--- a/lgsm/data/ubuntu-20.04.csv
+++ b/lgsm/data/ubuntu-20.04.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-11-jre
 vs
 wet
--- a/lgsm/data/ubuntu-22.04.csv
+++ b/lgsm/data/ubuntu-22.04.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-21-jre
 vs
 wet
--- a/lgsm/data/ubuntu-23.04.csv
+++ b/lgsm/data/ubuntu-23.04.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-21-jre
 vs
 wet
--- a/lgsm/data/ubuntu-23.10.csv
+++ b/lgsm/data/ubuntu-23.10.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-21-jre
 vs
 wet
--- a/lgsm/data/ubuntu-24.04.csv
+++ b/lgsm/data/ubuntu-24.04.csv
@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev,libatomic1,libpulse-dev
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,openjdk-21-jre
 vs
 wet
--- a/lgsm/modules/update_vints.sh
+++ b/lgsm/modules/update_vints.sh
@ -39,8 +39,10 @@ fn_update_remotebuild() {
 	remotebuildresponse=$(curl -s "${apiurl}")
 	if [ "${branch}" == "stable" ]; then
 		remotebuildversion=$(echo "${remotebuildresponse}" | jq -r '[ to_entries[] ] | .[].key' | grep -Ev "\-rc|\-pre" | sort -r -V | head -1)
-	else
+	elif [ "${branch}" == "unstable" ]; then
 		remotebuildversion=$(echo "${remotebuildresponse}" | jq -r '[ to_entries[] ] | .[].key' | grep -E "\-rc|\-pre" | sort -r -V | head -1)
 	else
 		remotebuildversion="${branch}"
 	fi
 	remotebuildfilename=$(echo "${remotebuildresponse}" | jq --arg remotebuildversion "${remotebuildversion}" -r '.[$remotebuildversion].linuxserver.filename')
 	remotebuildurl=$(echo "${remotebuildresponse}" | jq --arg remotebuildversion "${remotebuildversion}" -r '.[$remotebuildversion].linuxserver.urls.cdn')