From d76e65eadf78bf539dcce73d00162fce1f609b78 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 May 2023 21:24:00 +0100 Subject: [PATCH 1/4] chore: add details to details check --- .github/workflows/details-check.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/details-check.yml b/.github/workflows/details-check.yml index b268bd03d..7b04f2036 100644 --- a/.github/workflows/details-check.yml +++ b/.github/workflows/details-check.yml @@ -67,6 +67,9 @@ jobs: - name: Display parameters run: grep "startparameters" lgsm/config-default/config-lgsm/${{ matrix.shortname }}server/_default.cfg + - name: Details + run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server details + - name: Detect details run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server detect-details From 2e00adc109380625d929fc84f9c8d26ab039e0fa Mon Sep 17 00:00:00 2001 From: Brandon Frohs Date: Fri, 9 Jun 2023 11:35:34 -0400 Subject: [PATCH 2/4] fix(mcb): update version check to account for a colon (#4227) * update version check to account for a colon --------- Co-authored-by: Daniel Gibbs --- lgsm/functions/update_minecraft_bedrock.sh | 2 +- lgsm/modules/update_minecraft_bedrock.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/update_minecraft_bedrock.sh b/lgsm/functions/update_minecraft_bedrock.sh index aec940126..c17088171 100644 --- a/lgsm/functions/update_minecraft_bedrock.sh +++ b/lgsm/functions/update_minecraft_bedrock.sh @@ -34,7 +34,7 @@ fn_update_localbuild() { # Gets local build info. fn_print_dots "Checking local build: ${remotelocation}" # Uses log file to get local build. - localbuild=$(grep Version "${consolelogdir}"/* 2> /dev/null | tail -1 | sed 's/.*Version //' | tr -d '\000-\011\013-\037') + localbuild=$(grep Version "${consolelogdir}"/* 2> /dev/null | tail -1 | sed 's/.*Version: //' | tr -d '\000-\011\013-\037') if [ -z "${localbuild}" ]; then fn_print_error "Checking local build: ${remotelocation}: missing local build info" fn_script_log_error "Missing local build info" diff --git a/lgsm/modules/update_minecraft_bedrock.sh b/lgsm/modules/update_minecraft_bedrock.sh index 075286096..3c3885a9d 100644 --- a/lgsm/modules/update_minecraft_bedrock.sh +++ b/lgsm/modules/update_minecraft_bedrock.sh @@ -34,7 +34,7 @@ fn_update_localbuild() { # Gets local build info. fn_print_dots "Checking local build: ${remotelocation}" # Uses log file to get local build. - localbuild=$(grep Version "${consolelogdir}"/* 2> /dev/null | tail -1 | sed 's/.*Version //' | tr -d '\000-\011\013-\037') + localbuild=$(grep Version "${consolelogdir}"/* 2> /dev/null | tail -1 | sed 's/.*Version: //' | tr -d '\000-\011\013-\037') if [ -z "${localbuild}" ]; then fn_print_error "Checking local build: ${remotelocation}: missing local build info" fn_script_log_error "Missing local build info" From 71be098ec08e8c63e4f36b6a683e93ed054b405c Mon Sep 17 00:00:00 2001 From: Bibo164 <14028796+Bibo164@users.noreply.github.com> Date: Fri, 9 Jun 2023 17:36:23 +0200 Subject: [PATCH 3/4] fix(pmc): Removed hardcoded project name in update update_papermc.sh (#4225) * fix: Removed hardcoded project name in update update_papermc.sh Script was unable to fetch the proper builds for WaterfallMC due to it checking PaperMC instead. Replaced the hardcoded .../paper/... project name with the already existing ${paperproject} to fix the issue --------- Co-authored-by: Daniel Gibbs --- lgsm/modules/update_papermc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/modules/update_papermc.sh b/lgsm/modules/update_papermc.sh index b7bdee8fd..b70a2d69d 100644 --- a/lgsm/modules/update_papermc.sh +++ b/lgsm/modules/update_papermc.sh @@ -51,7 +51,7 @@ fn_update_remotebuild() { fi fi # Get list of paper builds for specific Minecraft: Java Edition version. - remotebuildresponsemcversion=$(curl -s "${apiurl}/paper/versions/${remotebuildmcversion}") + remotebuildresponsemcversion=$(curl -s "${apiurl}/${paperproject}/versions/${remotebuildmcversion}") # Get latest paper build for specific Minecraft: Java Edition version. remotebuildpaperversion=$(echo "${remotebuildresponsemcversion}" | jq -r '.builds[-1]') # Get various info about the paper build. From 9e347fe9fae88349fb7c0b500d709103847376c7 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 9 Jun 2023 16:38:29 +0100 Subject: [PATCH 4/4] Release v23.3.3 This commit updates the version of the core to v23.3.3. Additionally, it removes updates the .gitignore file. --- .gitignore | 3 +-- linuxgsm.sh | 2 +- tests/tests_fctrserver.sh | 2 +- tests/tests_jc2server.sh | 2 +- tests/tests_mcserver.sh | 2 +- tests/tests_ts3server.sh | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8bb6a5b32..e5c465ce2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -*.db -.idea +.vscode/settings.json /node_modules diff --git a/linuxgsm.sh b/linuxgsm.sh index 4e3d27e15..d8a28d604 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v23.3.2" +version="v23.3.3" shortname="core" gameservername="core" commandname="CORE" diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh index f135c98eb..3c97fffaf 100644 --- a/tests/tests_fctrserver.sh +++ b/tests/tests_fctrserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v23.3.2" +version="v23.3.3" shortname="fctr" gameservername="fctrserver" commandname="CORE" diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 2f0204f7b..9604ddb06 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v23.3.2" +version="v23.3.3" shortname="jc2" gameservername="jc2server" commandname="CORE" diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh index 38b39e62d..ff2a01b12 100644 --- a/tests/tests_mcserver.sh +++ b/tests/tests_mcserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v23.3.2" +version="v23.3.3" shortname="mc" gameservername="mcserver" commandname="CORE" diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index d3e73133d..bf0bf9fb7 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v23.3.2" +version="v23.3.3" shortname="ts3" gameservername="ts3server" commandname="CORE"