diff options
| -rw-r--r-- | scripts/deploybuild.py | 22 | ||||
| -rw-r--r-- | zenserver/upstream/jupiter.cpp | 4 |
2 files changed, 15 insertions, 11 deletions
diff --git a/scripts/deploybuild.py b/scripts/deploybuild.py index c81235a8c..d137c3da1 100644 --- a/scripts/deploybuild.py +++ b/scripts/deploybuild.py @@ -50,20 +50,20 @@ while not os.path.exists(os.path.join(zenroot, "zen.sln")): zenroot = os.path.dirname(zenroot) jazz_print("Zen root:", zenroot) - # Build fresh binaries -if use_xmake: - build_cmd = ["xmake", "-b", "zenserver"] - build_output_dir = r'build\windows\x64\release' -else: - vs_path = vswhere.get_latest_path() # can also specify prerelease=True - jazz_print("BUILDING CODE", f"using VS root: {vs_path}") - devenv_path = os.path.join(vs_path, "Common7\\IDE\\devenv.com") - build_cmd = [devenv_path, "/build", "Release", "zen.sln"] - build_output_dir = r'x64\Release' - try: + if use_xmake: + subprocess.run(["xmake.exe", "config", "-p", "windows", "-a", "x64", "-m", "release"], check=True) + build_cmd = ["xmake.exe", "build", "--rebuild", "zenserver"] + build_output_dir = r'build\windows\x64\release' + else: + vs_path = vswhere.get_latest_path() # can also specify prerelease=True + jazz_print("BUILDING CODE", f"using VS root: {vs_path}") + devenv_path = os.path.join(vs_path, "Common7\\IDE\\devenv.com") + build_cmd = [devenv_path, "/build", "Release", "zen.sln"] + build_output_dir = r'x64\Release' + subprocess.run(build_cmd, check=True) except: jazz_fail("Build failed!") diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp index 9223ea0f4..1f82f4a04 100644 --- a/zenserver/upstream/jupiter.cpp +++ b/zenserver/upstream/jupiter.cpp @@ -673,6 +673,7 @@ CloudCacheSession::GetComputeUpdates(std::string_view ChannelId, const uint32_t Session.SetOption(cpr::Url{Uri.c_str()}); Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/x-ue-cb"}}); + Session.SetOption(cpr::Body{}); cpr::Response Response = Session.Post(); ZEN_DEBUG("POST {}", Response); @@ -708,6 +709,7 @@ CloudCacheSession::GetObjectTree(const IoHash& Key) Session.SetOption(cpr::Url{Uri.c_str()}); Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/octet-stream"}}); + Session.SetOption(cpr::Body{}); cpr::Response Response = Session.Get(); ZEN_DEBUG("GET {}", Response); @@ -772,6 +774,7 @@ CloudCacheSession::CacheTypeExists(std::string_view TypeId, const IoHash& Key) Session.SetOption(cpr::Url{Uri.c_str()}); Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}}); + Session.SetOption(cpr::Body{}); cpr::Response Response = Session.Head(); ZEN_DEBUG("HEAD {}", Response); @@ -810,6 +813,7 @@ CloudCacheSession::CacheTypeExists(std::string_view TypeId, const std::set<IoHas Session.SetOption(cpr::Url{Uri.c_str()}); Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/x-ue-cb"}}); + Session.SetOption(cpr::Body{}); cpr::Response Response = Session.Post(); ZEN_DEBUG("POST {}", Response); |