From 957c8d3d15ac5c0ae84e2e4a2945f182d88379c2 Mon Sep 17 00:00:00 2001
From: jak1 <jak1@themanaworld.org>
Date: Fri, 23 Dec 2022 13:42:01 +0100
Subject: updated mplint repository

---
 tools/ci/jobs/mplint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/ci/jobs/mplint.sh b/tools/ci/jobs/mplint.sh
index 66a056dba..d3508759f 100755
--- a/tools/ci/jobs/mplint.sh
+++ b/tools/ci/jobs/mplint.sh
@@ -19,7 +19,7 @@ export CXXFLAGS="-std=gnu++11"
 do_init
 
 rm -rf mplint || true
-gitclone https://gitlab.com/manaplus mplint.git
+gitclone https://git.themanaworld.org/mana mplint.git
 cd mplint
 run_configure_simple
 run_make
-- 
cgit v1.2.3-70-g09d2


From 386a47710b235051eedf254f56b01972096aac7e Mon Sep 17 00:00:00 2001
From: jak1 <jak1@themanaworld.org>
Date: Mon, 3 Apr 2023 00:59:43 +0200
Subject: CI: fixed some apt issues (some vars are usable, some are not TF dont
 deprecate working stuff <_<)

---
 .gitignore                      | 5 ++++-
 tools/ci/scripts/dockerretry.sh | 2 +-
 tools/ci/scripts/updaterepos.sh | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/.gitignore b/.gitignore
index 8261596c7..bf274d538 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,4 +176,7 @@ src/resources/image/image.h.gch
 
 # linters
 mplint
-cpplint.py
\ No newline at end of file
+cpplint.py
+
+# local gitlab-ci
+.gitlab-ci-local/ 
diff --git a/tools/ci/scripts/dockerretry.sh b/tools/ci/scripts/dockerretry.sh
index 121878cbb..ed8dbdc80 100755
--- a/tools/ci/scripts/dockerretry.sh
+++ b/tools/ci/scripts/dockerretry.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # skip if we not in docker
-if [[ ${CI_RUNNER_TAGS} != *"docker"* ]]; then
+if [[ "$RUNFROMSHELL" != "" ]]; then
     echo "Running from shell. Skipping $*"
     exit 0
 fi
diff --git a/tools/ci/scripts/updaterepos.sh b/tools/ci/scripts/updaterepos.sh
index f0698fc19..167898a83 100755
--- a/tools/ci/scripts/updaterepos.sh
+++ b/tools/ci/scripts/updaterepos.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ ${CI_RUNNER_TAGS} != *"docker"* ]]; then
+if [[ "$RUNFROMSHELL" != "" ]]; then
     echo "Running from shell. Skipping update repos"
     exit 0
 fi
-- 
cgit v1.2.3-70-g09d2


From 2ee76e47a61b2ad8898bec25e4093fa9c6d2a9bf Mon Sep 17 00:00:00 2001
From: jak1 <jak1@themanaworld.org>
Date: Mon, 3 Apr 2023 03:13:42 +0200
Subject: change serverlist url to tmw2.org, since manaplus.germantmw.de doesnt
 work (i dont rly know why, but all our updates are hosted there, so our
 serverlist now)

---
 src/defaults.cpp             | 4 ++--
 tools/ci/scripts/runtests.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/src/defaults.cpp b/src/defaults.cpp
index 43061cf09..3f806f572 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -502,9 +502,9 @@ void setBrandingDefaults(Configuration &cfg)
     AddDEF("defaultPort", DEFAULT_PORT);
     AddDEF("defaultServerType", "evol2");
     AddDEF("onlineServerList",
-           "https://manaplus.germantmw.de/manaplus/serverlist.xml");
+           "https://tmw2.org/updates/serverlist.xml");
     AddDEF("onlineServerList2",
-           "http://manaplus.germantmw.de/manaplus/serverlist.xml");
+           "https://tmw2.org/updates/serverlist.xml");
     AddDEF("onlineServerFile", "serverlistplus.xml");
     AddDEF("appShort", "mana");
     AddDEF("screenshots", "ManaPlus");
diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh
index 18bcd7512..9f0a6729f 100755
--- a/tools/ci/scripts/runtests.sh
+++ b/tools/ci/scripts/runtests.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ ${CI_RUNNER_TAGS} != *"docker"* ]]; then
+if [[ "$RUNFROMSHELL" != "" ]]; then
     if [[ ${CIRRUS_CI} != "true" ]]; then
         echo "Running from shell. Skipping run tests $*"
         exit 0
-- 
cgit v1.2.3-70-g09d2


From 7f4eacd484d72bcecf3605c4fba6d277bc9261ef Mon Sep 17 00:00:00 2001
From: jak1 <jak1@themanaworld.org>
Date: Thu, 6 Apr 2023 11:33:05 +0200
Subject: removed assertion for sdl surface bpp, tests get ugly, but default
 runtime works fine added "-A 20" to assert grep, so we get the backtrace
 directly in our pipelines

---
 src/resources/sdlimagehelper.cpp | 1 -
 tools/ci/scripts/runtest.sh      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'tools')

diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index 852064799..27e8f2f5d 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -224,7 +224,6 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage)
 
     if (tmpImage->format->BitsPerPixel != 32)
     {
-        reportAlways("Non 32 bit image detected")
         tmpImage = convertTo32Bit(tmpImage);
 
         if (tmpImage == nullptr)
diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh
index 7c41da5ce..7707a34aa 100755
--- a/tools/ci/scripts/runtest.sh
+++ b/tools/ci/scripts/runtest.sh
@@ -18,7 +18,7 @@ function check_is_run {
 }
 
 function check_assert {
-    grep "Assert:" "${HOME}/.local/share/mana/manaplus.log"
+    grep -A 20 "Assert:" "${HOME}/.local/share/mana/manaplus.log"
     if [ "$?" == 0 ]; then
         echo "Assert found in log"
         exit 1
-- 
cgit v1.2.3-70-g09d2