diff options
| author | Fedja Beader <fedja@protonmail.ch> | 2024-04-04 00:26:44 +0200 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2024-04-04 00:26:44 +0200 |
| commit | e47d50f11ddd56028b81c8a246ff4bd77f329a36 (patch) | |
| tree | b241901d777e00cdfa74e706b2d446ce8dbfd9bf | |
| parent | c09e2c182a546608f186f263c16129a36a0fbac6 (diff) | |
| download | manaplus-e47d50f11ddd56028b81c8a246ff4bd77f329a36.tar.gz manaplus-e47d50f11ddd56028b81c8a246ff4bd77f329a36.tar.bz2 manaplus-e47d50f11ddd56028b81c8a246ff4bd77f329a36.tar.xz manaplus-e47d50f11ddd56028b81c8a246ff4bd77f329a36.zip | |
Poke CI some more
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | src/net/download.cpp | 9 | ||||
| -rwxr-xr-x | tools/ci/scripts/runtest.sh | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 478f7ce85..2bc041c0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -184,7 +184,7 @@ variables: tags: - docker -gcc-7_default: +.gcc-7_default: stage: prebuild script: - ./tools/ci/scripts/patchsdl1.sh @@ -292,7 +292,7 @@ gcc-10_game_only: tags: - docker -gcc-10_dyecmd_only: +.gcc-10_dyecmd_only: stage: prebuild script: - ./tools/ci/scripts/patchsdl1.sh diff --git a/src/net/download.cpp b/src/net/download.cpp index b337e048d..02ef19d29 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -54,6 +54,15 @@ namespace Net std::string Download::mUploadResponse; +/* + mDownload = new Net::Download(this, tmw2.org...serverlist, &downloadUpdate, false, false, true); + mDownload->setFile(pathJoin(mDir, + branding.getStringValue("onlineServerFile")), + -1); + if (!listFile2.empty()) + mDownload->addMirror(listFile2); + mDownload->start(); +*/ Download::Download(void *const ptr, const std::string &url, const DownloadUpdate updateFunction, diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh index ba421b246..30546f5ad 100755 --- a/tools/ci/scripts/runtest.sh +++ b/tools/ci/scripts/runtest.sh @@ -31,6 +31,10 @@ function wait_for_servers_list { echo "wait for servers list ${n}" df -h curl https://tmw2.org/updates/serverlist.xml + stat "${HOME}/.config/mana/mana/" + ls "${HOME}/.config/mana/mana/" + dd if=/dev/zero of="${HOME}/.config/mana/mana/serverlistplus.xml" bs=4K count=3 + rm "${HOME}/.config/mana/mana/serverlistplus.xml" check_is_run # check here grep "Skipping servers list update" "${HOME}/.local/share/mana/manaplus.log" && return |