summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjak1 <jak1@themanaworld.org>2023-04-03 03:13:42 +0200
committerjak1 <jak1@themanaworld.org>2023-04-03 03:13:42 +0200
commit2ee76e47a61b2ad8898bec25e4093fa9c6d2a9bf (patch)
treee044d9b34c70e027d84ba1fc6c54d92532f467be
parent386a47710b235051eedf254f56b01972096aac7e (diff)
downloadmv-2ee76e47a61b2ad8898bec25e4093fa9c6d2a9bf.tar.gz
mv-2ee76e47a61b2ad8898bec25e4093fa9c6d2a9bf.tar.bz2
mv-2ee76e47a61b2ad8898bec25e4093fa9c6d2a9bf.tar.xz
mv-2ee76e47a61b2ad8898bec25e4093fa9c6d2a9bf.zip
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)
-rw-r--r--src/defaults.cpp4
-rwxr-xr-xtools/ci/scripts/runtests.sh2
2 files changed, 3 insertions, 3 deletions
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