Use upstream apply with Horde

1 files changed, 10 insertions, 17 deletions

diff --git a/zenserver/upstream/upstreamapply.cpp b/zenserver/upstream/upstreamapply.cpp
index a9b0e7fd0..038353683 100644
--- a/zenserver/upstream/upstreamapply.cpp
+++ b/zenserver/upstream/upstreamapply.cpp
@@ -439,8 +439,7 @@ namespace detail {
 						return {.Error{.ErrorCode = -1,
 									   .Reason	  = "Task {}: {}"_format(ComputeTaskOutcomeToString(Outcome), std::string(Detail))}};
 					}
-					return {
-						.Error{.ErrorCode = -1, .Reason = "Task {}"_format(ComputeTaskOutcomeToString(Outcome))}};
+					return {.Error{.ErrorCode = -1, .Reason = "Task {}"_format(ComputeTaskOutcomeToString(Outcome))}};
 				}
 
 				const IoHash		   TaskId	  = TaskStatus["h"sv].AsObjectAttachment();
@@ -796,29 +795,23 @@ namespace detail {
 			const IoHash SandboxHash  = Sandbox.GetHash();
 			Data.Objects[SandboxHash] = std::move(Sandbox);
 
-
-			std::string_view HostPlatform = ApplyRecord.WorkerDescriptor["host"sv].AsString();
-			CbObject Requirements;
-			if (HostPlatform == "Win64"sv)
-			{
-				Requirements = BuildRequirements("OSFamily == 'Windows'"sv, {}, false);
-			}
-			else
 			{
-				Log().warn("process apply upstream FAILED, unsupported Host Platform '{}'", HostPlatform);
-				return false;
+				using namespace fmt::literals;
+				std::string_view HostPlatform	= ApplyRecord.WorkerDescriptor["host"sv].AsString();
+				// TODO: Enable when Horde accepts the UE style Host Platforms (Win64, Linux, Mac)
+				//CbObject		 Requirements	= BuildRequirements("OSFamily == '{}'"_format(HostPlatform), {}, false);
+				CbObject	 Requirements		= BuildRequirements("OSFamily == 'Windows'", {}, false);
+				const IoHash	 RequirementsId = Requirements.GetHash();
+				Data.Objects[RequirementsId]	= std::move(Requirements);
+				Data.RequirementsId				= RequirementsId;
 			}
 
-			const IoHash RequirementsId	 = Requirements.GetHash();
-			Data.Objects[RequirementsId] = std::move(Requirements);
-			Data.RequirementsId			 = RequirementsId;
-
 			CbObject Task = BuildTask(ExecutablePath,
 									  {"-Build=build.action"},
 									  Environment,
 									  {},
 									  SandboxHash,
-									  RequirementsId,
+									  Data.RequirementsId,
 									  {"Build.output", "Outputs"});
 
 			const IoHash TaskId	 = Task.GetHash();