Merge 0.9.0

.buildkite/hooks/pre-command

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -e -u -o pipefail
+if [[ -n "${DEBUG-}" ]]; then
+    set -x
+fi
+
+if [[ ${BUILDKITE_AGENT_META_DATA_OS} == darwin* ]]; then
+    ./ci/cleanup.sh
+elif [[ ${BUILDKITE_AGENT_META_DATA_OS} == linux* ]]; then
+    echo "Running a linux agent, no need for any cleanup."
+    exit 0
+else
+    powershell -noprofile -noninteractive -file "./ci/cleanup.ps1"
+fi

.buildkite/premerge.steps.yaml

@@ -1,9 +1,17 @@
 ---
+# This is designed to trap and retry failures because agent lost
+# connection. Agent exits with -1 in this case.
 agent_transients: &agent_transients
-  # This is designed to trap and retry failures because agent lost
-  # connection. Agent exits with -1 in this case.
   exit_status: -1
   limit: 3
+# BK system error
+bk_system_error: &bk_system_error
+  exit_status: 255
+  limit: 3
+# job was interrupted by a signal (e.g. ctrl+c etc)
+bk_interrupted_by_signal: &bk_interrupted_by_signal
+  exit_status: 15
+  limit: 3
 
 script_runner: &script_runner
   agents:
@@ -13,33 +21,63 @@ script_runner: &script_runner
   - "machine_type=quarter"
   - "permission_set=builder"
   - "platform=linux"
-  - "queue=${CI_LINUX_BUILDER_QUEUE:-v3-1571392077-9a4506d980673dea-------z}"
+  - "queue=${CI_LINUX_BUILDER_QUEUE:-v4-2019-12-12-bk5225-daecba805768d787}"
   - "scaler_version=2"
   - "working_hours_time_zone=london"
 
+windows: &windows
+  agents:
+    - "agent_count=1"
+    - "capable_of_building=gdk-for-unreal"
+    - "environment=production"
+    - "machine_type=single-high-cpu"  # this name matches to SpatialOS node-size names
+    - "platform=windows"
+    - "permission_set=builder"
+    - "scaler_version=2"
+    - "queue=${CI_WINDOWS_BUILDER_QUEUE:-v4-20-03-26-102432-bk9951-8afe0ffb}"
+  retry:
+    automatic:
+      - <<: *agent_transients
+      - <<: *bk_system_error
+      - <<: *bk_interrupted_by_signal
+  timeout_in_minutes: 60
+  plugins:
+    - ca-johnson/taskkill#v4.1: ~
+
 # NOTE: step labels turn into commit-status names like {org}/{repo}/{pipeline}/{step-label}, lower-case and hyphenated.
 # These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
 
 steps:
-  - label: "enforce version restrictions"
+  - label: "enforce-version-restrictions"
     command: "ci/check-version-file.sh"
     <<: *script_runner
   # No point in running other steps if the listed versions are invalid
-  - wait 
+  - wait: ~
 
   # Trigger an Example Project build for any merges into master, preview or release branches of UnrealGDK
   - trigger: "unrealgdkexampleproject-nightly"
-    label: "Post merge Example Project build"
+    label: "post-merge-example-project-build"
     branches: "master preview release"
     async: true
     build:
       env:
+        NIGHTLY_BUILD: "${NIGHTLY_BUILD:-false}"
         GDK_BRANCH: "${BUILDKITE_BRANCH}"
 
-  - label: "generate and upload GDK build steps"
+  - label: "generate-pipeline-steps"
     commands:
-      - "chmod -R +rwx ci" # give the Linux user access to everything in the ci directory
-      - "ci/generate_and_upload_build_steps.sh"
-    env:
-        ENGINE_VERSION: "${ENGINE_VERSION}"
+      - "ci/generate-and-upload-build-steps.sh"
+    <<: *script_runner
+
+  - wait: ~
+    continue_on_failure: true
+
+  - label: "upload-test-metrics"
+    if: build.env("NIGHTLY_BUILD") == "true"
+    command: "ci/upload-test-metrics.sh"
     <<: *script_runner
+
+  - label: "slack-notify"
+    if: (build.env("SLACK_NOTIFY") == "true" || build.branch == "master") && build.env("SLACK_NOTIFY") != "false"
+    commands: "powershell ./ci/build-and-send-slack-notification.ps1"
+    <<: *windows

CONTRIBUTING.md

@@ -13,4 +13,4 @@ We welcome any and all
 
 ## Coding standards
 
-See the [GDK for Unreal C++ coding standards guide](./SpatialGDK/Documentation/contributions/unreal-gdk-coding-standards.md).
+See the [GDK for Unreal C++ coding standards guide](./SpatialGDK/Documentation/contributions/unreal-gdk-coding-standards.md).

RequireSetup

@@ -1,4 +1,4 @@
 Increment the below number whenever it is required to run Setup.bat as part of a new commit.
 Our git hooks will detect this file has been updated and automatically run Setup.bat on pull.
 
-40
+53

Setup.bat

@@ -1,6 +1,8 @@
 @echo off
 
-setlocal
+if not defined NO_SET_LOCAL (
+    setlocal
+)
 
 pushd "%~dp0"
 
@@ -58,8 +60,10 @@ call :MarkStartOfBlock "Setup variables"
     set SCHEMA_STD_COPY_DIR=%~dp0..\..\..\spatial\build\dependencies\schema\standard_library
     set SPATIAL_DIR=%~dp0..\..\..\spatial
     set DOMAIN_ENVIRONMENT_VAR=
+    set DOWNLOAD_MOBILE=
     for %%A in (%*) do (
         if "%%A"=="--china" set DOMAIN_ENVIRONMENT_VAR=--environment cn-production
+        if "%%A"=="--mobile" set DOWNLOAD_MOBILE=True
     )
 call :MarkEndOfBlock "Setup variables"
 
@@ -81,6 +85,7 @@ call :MarkStartOfBlock "Create folders"
     md "%CORE_SDK_DIR%\tools"        >nul 2>nul
     md "%CORE_SDK_DIR%\worker_sdk"   >nul 2>nul
     md "%BINARIES_DIR%"              >nul 2>nul
+    md "%BINARIES_DIR%\Android"      >nul 2>nul
     md "%BINARIES_DIR%\Programs"     >nul 2>nul
 
     if exist "%SPATIAL_DIR%" (
@@ -96,7 +101,12 @@ call :MarkStartOfBlock "Retrieve dependencies"
     spatial package retrieve worker_sdk      c-dynamic-x86-vc141_md-win32               %PINNED_CORE_SDK_VERSION%   %DOMAIN_ENVIRONMENT_VAR%   "%CORE_SDK_DIR%\worker_sdk\c-dynamic-x86-vc141_md-win32.zip"
     spatial package retrieve worker_sdk      c-dynamic-x86_64-vc141_md-win32            %PINNED_CORE_SDK_VERSION%   %DOMAIN_ENVIRONMENT_VAR%   "%CORE_SDK_DIR%\worker_sdk\c-dynamic-x86_64-vc141_md-win32.zip"
     spatial package retrieve worker_sdk      c-dynamic-x86_64-gcc510-linux              %PINNED_CORE_SDK_VERSION%   %DOMAIN_ENVIRONMENT_VAR%   "%CORE_SDK_DIR%\worker_sdk\c-dynamic-x86_64-gcc510-linux.zip"
+if defined DOWNLOAD_MOBILE (
     spatial package retrieve worker_sdk      c-static-fullylinked-arm-clang-ios         %PINNED_CORE_SDK_VERSION%   %DOMAIN_ENVIRONMENT_VAR%   "%CORE_SDK_DIR%\worker_sdk\c-static-fullylinked-arm-clang-ios.zip"
+    spatial package retrieve worker_sdk      c-dynamic-arm64v8a-clang_ndk16b-android    %PINNED_CORE_SDK_VERSION%   %DOMAIN_ENVIRONMENT_VAR%   "%CORE_SDK_DIR%\worker_sdk\c-dynamic-arm64v8a-clang_ndk16b-android.zip"
+    spatial package retrieve worker_sdk      c-dynamic-armv7a-clang_ndk16b-android      %PINNED_CORE_SDK_VERSION%   %DOMAIN_ENVIRONMENT_VAR%   "%CORE_SDK_DIR%\worker_sdk\c-dynamic-armv7a-clang_ndk16b-android.zip"
+    spatial package retrieve worker_sdk      c-dynamic-x86_64-clang_ndk16b-android      %PINNED_CORE_SDK_VERSION%   %DOMAIN_ENVIRONMENT_VAR%   "%CORE_SDK_DIR%\worker_sdk\c-dynamic-x86_64-clang_ndk16b-android.zip"
+)
     spatial package retrieve worker_sdk      csharp                                     %PINNED_CORE_SDK_VERSION%   %DOMAIN_ENVIRONMENT_VAR%   "%CORE_SDK_DIR%\worker_sdk\csharp.zip"
     spatial package retrieve spot            spot-win64                                 %PINNED_SPOT_VERSION%       %DOMAIN_ENVIRONMENT_VAR%   "%BINARIES_DIR%\Programs\spot.exe"
 call :MarkEndOfBlock "Retrieve dependencies"
@@ -107,9 +117,15 @@ call :MarkStartOfBlock "Unpack dependencies"
                         "Expand-Archive -Path \"%CORE_SDK_DIR%\worker_sdk\c-dynamic-x86_64-vc141_md-win32.zip\"            -DestinationPath \"%BINARIES_DIR%\Win64\" -Force; "^
                         "Expand-Archive -Path \"%CORE_SDK_DIR%\worker_sdk\c-dynamic-x86_64-gcc510-linux.zip\"              -DestinationPath \"%BINARIES_DIR%\Linux\" -Force; "^
                         "Expand-Archive -Path \"%CORE_SDK_DIR%\worker_sdk\csharp.zip\"                                     -DestinationPath \"%BINARIES_DIR%\Programs\worker_sdk\csharp\" -Force; "^
-                        "Expand-Archive -Path \"%CORE_SDK_DIR%\worker_sdk\c-static-fullylinked-arm-clang-ios.zip\"         -DestinationPath \"%BINARIES_DIR%\IOS\" -Force;"^
                         "Expand-Archive -Path \"%CORE_SDK_DIR%\tools\schema_compiler-x86_64-win32.zip\"                    -DestinationPath \"%BINARIES_DIR%\Programs\" -Force; "^
                         "Expand-Archive -Path \"%CORE_SDK_DIR%\schema\standard_library.zip\"                               -DestinationPath \"%BINARIES_DIR%\Programs\schema\" -Force;"
+
+    if defined DOWNLOAD_MOBILE (
+        powershell -Command "Expand-Archive -Path \"%CORE_SDK_DIR%\worker_sdk\c-static-fullylinked-arm-clang-ios.zip\"         -DestinationPath \"%BINARIES_DIR%\IOS\" -Force;"^
+                            "Expand-Archive -Path \"%CORE_SDK_DIR%\worker_sdk\c-dynamic-arm64v8a-clang_ndk16b-android.zip\"    -DestinationPath \"%BINARIES_DIR%\Android\arm64-v8a\" -Force; "^
+                            "Expand-Archive -Path \"%CORE_SDK_DIR%\worker_sdk\c-dynamic-armv7a-clang_ndk16b-android.zip\"      -DestinationPath \"%BINARIES_DIR%\Android\armeabi-v7a\" -Force; "^
+                            "Expand-Archive -Path \"%CORE_SDK_DIR%\worker_sdk\c-dynamic-x86_64-clang_ndk16b-android.zip\"      -DestinationPath \"%BINARIES_DIR%\Android\x86_64\" -Force; "^
+    )
     xcopy /s /i /q "%BINARIES_DIR%\Headers\include" "%WORKER_SDK_DIR%"
 call :MarkEndOfBlock "Unpack dependencies"
 

Setup.sh

@@ -3,34 +3,44 @@
 set -e -u -o pipefail
 [[ -n "${DEBUG:-}" ]] && set -x
 
-if [ "$(uname -s)" != "Darwin" ]; then
+if [[ "$(uname -s)" != "Darwin" ]]; then
     echo "This script should only be used on OS X. If you are using Windows, please run Setup.bat."
     exit 1
 fi
 
 pushd "$(dirname "$0")"
 
 PINNED_CORE_SDK_VERSION=$(cat ./SpatialGDK/Extras/core-sdk.version)
+PINNED_SPOT_VERSION=$(cat ./SpatialGDK/Extras/spot.version)
 BUILD_DIR="$(pwd)/SpatialGDK/Build"
 CORE_SDK_DIR="${BUILD_DIR}/core_sdk"
 WORKER_SDK_DIR="$(pwd)/SpatialGDK/Source/SpatialGDK/Public/WorkerSDK"
 BINARIES_DIR="$(pwd)/SpatialGDK/Binaries/ThirdParty/Improbable"
 SCHEMA_COPY_DIR="$(pwd)/../../../spatial/schema/unreal/gdk"
 SCHEMA_STD_COPY_DIR="$(pwd)/../../../spatial/build/dependencies/schema/standard_library"
 SPATIAL_DIR="$(pwd)/../../../spatial"
-if [[ "${1:-}" == "--china" ]]; then
-    DOMAIN_ENVIRONMENT_VAR="--environment cn-production"
-fi
+DOWNLOAD_MOBILE=
+
+while test $# -gt 0
+do
+    case "$1" in
+        --china) DOMAIN_ENVIRONMENT_VAR="--environment cn-production"
+            ;;
+        --mobile) DOWNLOAD_MOBILE=true
+            ;;
+    esac
+    shift
+done
 
 echo "Setup the git hooks"
-if [ -e .git/hooks ]; then
+if [[ -e .git/hooks ]]; then
     # Remove the old post-checkout hook.
-    if [ -e .git/hooks/post-checkout ]; then
+    if [[ -e .git/hooks/post-checkout ]]; then
         rm -f .git/hooks/post-checkout
     fi
 
     # Remove the old post-merge hook.
-    if [ -e .git/hooks/post-merge ]; then
+    if [[ -e .git/hooks/post-merge ]]; then
         rm -f .git/hooks/post-merge
     fi
 
@@ -43,7 +53,7 @@ rm -rf "${CORE_SDK_DIR}"
 rm -rf "${WORKER_SDK_DIR}"
 rm -rf "${BINARIES_DIR}"
 
-if [ -d "${SPATIAL_DIR}" ]; then
+if [[ -d "${SPATIAL_DIR}" ]]; then
     rm -rf "${SCHEMA_STD_COPY_DIR}"
     rm -rf "${SCHEMA_COPY_DIR}"
 fi
@@ -53,38 +63,55 @@ mkdir -p "${WORKER_SDK_DIR}"
 mkdir -p "${CORE_SDK_DIR}"/schema
 mkdir -p "${CORE_SDK_DIR}"/tools
 mkdir -p "${CORE_SDK_DIR}"/worker_sdk
+mkdir -p "${BINARIES_DIR}"/Android
 mkdir -p "${BINARIES_DIR}"/Programs/worker_sdk
 
-if [ -d "${SPATIAL_DIR}" ]; then
+if [[ -d "${SPATIAL_DIR}" ]]; then
     mkdir -p "${SCHEMA_STD_COPY_DIR}"
     mkdir -p "${SCHEMA_COPY_DIR}"
 fi
 
 echo "Retrieve dependencies"
-spatial package retrieve tools       schema_compiler-x86_64-macos        "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/tools/schema_compiler-x86_64-macos.zip
-spatial package retrieve schema      standard_library                    "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/schema/standard_library.zip
-spatial package retrieve worker_sdk  c_headers                           "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/c_headers.zip
-spatial package retrieve worker_sdk  c-dynamic-x86_64-clang-macos        "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-x86_64-clang-macos.zip
-spatial package retrieve worker_sdk  c-static-fullylinked-arm-clang-ios  "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/c-static-fullylinked-arm-clang-ios.zip
-spatial package retrieve worker_sdk  csharp                              "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/csharp.zip
-spatial package retrieve spot        spot-macos                          "${PINNED_SPOT_VERSION}"       ${DOMAIN_ENVIRONMENT_VAR:-}   "${BINARIES_DIR}"/Programs/spot
+spatial package retrieve tools       schema_compiler-x86_64-macos            "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/tools/schema_compiler-x86_64-macos.zip
+spatial package retrieve schema      standard_library                        "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/schema/standard_library.zip
+spatial package retrieve worker_sdk  c_headers                               "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/c_headers.zip
+spatial package retrieve worker_sdk  c-dynamic-x86_64-clang-macos            "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-x86_64-clang-macos.zip
+
+if [[ -n "${DOWNLOAD_MOBILE}" ]];
+then
+    spatial package retrieve worker_sdk  c-static-fullylinked-arm-clang-ios      "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/c-static-fullylinked-arm-clang-ios.zip
+    spatial package retrieve worker_sdk  c-dynamic-arm64v8a-clang_ndk16b-android "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-arm64v8a-clang_ndk16b-android.zip
+    spatial package retrieve worker_sdk  c-dynamic-armv7a-clang_ndk16b-android   "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-armv7a-clang_ndk16b-android.zip
+    spatial package retrieve worker_sdk  c-dynamic-x86_64-clang_ndk16b-android   "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-x86_64-clang_ndk16b-android.zip
+fi
+
+spatial package retrieve worker_sdk  csharp                                  "${PINNED_CORE_SDK_VERSION}"   ${DOMAIN_ENVIRONMENT_VAR:-}   "${CORE_SDK_DIR}"/worker_sdk/csharp.zip
+spatial package retrieve spot        spot-macos                              "${PINNED_SPOT_VERSION}"       ${DOMAIN_ENVIRONMENT_VAR:-}   "${BINARIES_DIR}"/Programs/spot
 chmod +x "${BINARIES_DIR}"/Programs/spot
 
 echo "Unpack dependencies"
-unzip -oq "${CORE_SDK_DIR}"/tools/schema_compiler-x86_64-macos.zip            -d "${BINARIES_DIR}"/Programs/
-unzip -oq "${CORE_SDK_DIR}"/schema/standard_library.zip                       -d "${BINARIES_DIR}"/Programs/schema/
-unzip -oq "${CORE_SDK_DIR}"/worker_sdk/c_headers.zip                          -d "${BINARIES_DIR}"/Headers/
-unzip -oq "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-x86_64-clang-macos.zip       -d "${BINARIES_DIR}"/Mac/
-unzip -oq "${CORE_SDK_DIR}"/worker_sdk/c-static-fullylinked-arm-clang-ios.zip -d "${BINARIES_DIR}"/IOS/
-unzip -oq "${CORE_SDK_DIR}"/worker_sdk/csharp.zip                             -d "${BINARIES_DIR}"/Programs/worker_sdk/csharp/
+unzip -oq "${CORE_SDK_DIR}"/tools/schema_compiler-x86_64-macos.zip                 -d "${BINARIES_DIR}"/Programs/
+unzip -oq "${CORE_SDK_DIR}"/schema/standard_library.zip                            -d "${BINARIES_DIR}"/Programs/schema/
+unzip -oq "${CORE_SDK_DIR}"/worker_sdk/c_headers.zip                               -d "${BINARIES_DIR}"/Headers/
+unzip -oq "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-x86_64-clang-macos.zip            -d "${BINARIES_DIR}"/Mac/
+
+if [[ -n "${DOWNLOAD_MOBILE}" ]];
+then
+    unzip -oq "${CORE_SDK_DIR}"/worker_sdk/c-static-fullylinked-arm-clang-ios.zip      -d "${BINARIES_DIR}"/IOS/
+    unzip -oq "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-arm64v8a-clang_ndk16b-android.zip -d "${BINARIES_DIR}"/Android/arm64-v8a/
+    unzip -oq "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-armv7a-clang_ndk16b-android.zip   -d "${BINARIES_DIR}"/Android/armeabi-v7a/
+    unzip -oq "${CORE_SDK_DIR}"/worker_sdk/c-dynamic-x86_64-clang_ndk16b-android.zip   -d "${BINARIES_DIR}"/Android/x86_64/
+fi
+
+unzip -oq "${CORE_SDK_DIR}"/worker_sdk/csharp.zip                                  -d "${BINARIES_DIR}"/Programs/worker_sdk/csharp/
 cp -R "${BINARIES_DIR}"/Headers/include/ "${WORKER_SDK_DIR}"
 
-if [ -d "${SPATIAL_DIR}" ]; then
+if [[ -d "${SPATIAL_DIR}" ]]; then
     echo "Copying standard library schemas to ${SCHEMA_STD_COPY_DIR}"
-    cp -R "${BINARIES_DIR}/Programs/schema" "${SCHEMA_STD_COPY_DIR}"
+    cp -R "${BINARIES_DIR}/Programs/schema/." "${SCHEMA_STD_COPY_DIR}"
 
     echo "Copying schemas to ${SCHEMA_COPY_DIR}"
-    cp -R SpatialGDK/Extras/schema "${SCHEMA_COPY_DIR}"
+    cp -R SpatialGDK/Extras/schema/. "${SCHEMA_COPY_DIR}"
 fi
 
 popd

SetupIncTraceLibs.bat

@@ -0,0 +1,43 @@
+rem **** Warning - Experimental functionality ****
+rem We do not support this functionality currently: Do not use it unless you are Improbable staff.
+rem **** 
+
+@echo off
+
+set NO_PAUSE=1
+set NO_SET_LOCAL=1
+
+pushd "%~dp0"
+
+call Setup.bat %*
+
+call :MarkStartOfBlock "%~0"
+
+call :MarkStartOfBlock "Create folders"
+	md "%CORE_SDK_DIR%\trace_lib"    >nul 2>nul
+call :MarkEndOfBlock "Create folders"
+
+call :MarkStartOfBlock "Retrieve dependencies"	
+	spatial package retrieve internal        trace-dynamic-x86_64-vc140_md-win32        14.3.0-b2647-85717ee-WORKER-SNAPSHOT "%CORE_SDK_DIR%\trace_lib\trace-win32.zip"
+	spatial package retrieve internal        trace-dynamic-x86_64-gcc510-linux          14.3.0-b2647-85717ee-WORKER-SNAPSHOT "%CORE_SDK_DIR%\trace_lib\trace-linux.zip"
+call :MarkEndOfBlock "Retrieve dependencies"
+
+call :MarkStartOfBlock "Unpack dependencies"
+    powershell -Command "Expand-Archive -Path \"%CORE_SDK_DIR%\trace_lib\trace-win32.zip\"	-DestinationPath \"%BINARIES_DIR%\Win64\" -Force;"^
+						"Expand-Archive -Path \"%CORE_SDK_DIR%\trace_lib\trace-linux.zip\"	-DestinationPath \"%BINARIES_DIR%\Linux\" -Force;"
+	xcopy /s /i /q "%BINARIES_DIR%\Win64\improbable" "%WORKER_SDK_DIR%\improbable"
+call :MarkEndOfBlock "Unpack dependencies"
+
+call :MarkEndOfBlock "%~0"
+
+popd
+
+exit /b %ERRORLEVEL%
+
+:MarkStartOfBlock
+echo Starting: %~1
+exit /b 0
+
+:MarkEndOfBlock
+echo Finished: %~1
+exit /b 0

SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/Common/LinuxScripts.cs

@@ -16,7 +16,7 @@ shift 2
 
 # 2>/dev/null silences errors by redirecting stderr to the null device. This is done to prevent errors when a machine attempts to add the same user more than once.
 mkdir -p /improbable/logs/UnrealWorker/
-useradd $NEW_USER -m -d /improbable/logs/UnrealWorker/Logs 2>/dev/null
+useradd $NEW_USER -m -d /improbable/logs/UnrealWorker 2>/dev/null
 chown -R $NEW_USER:$NEW_USER $(pwd) 2>/dev/null
 chmod -R o+rw /improbable/logs 2>/dev/null
 
@@ -55,6 +55,13 @@ shift 1
 
         public const string SimulatedPlayerCoordinatorShellScript =
 @"#!/bin/sh
+
+# Some clients are quite large so in order to avoid running out of disk space on the node we attempt to delete the zip
+WORKER_ZIP_DIR=""/tmp/runner_source/""
+if [ -d ""$WORKER_ZIP_DIR"" ]; then
+  rm -rf ""$WORKER_ZIP_DIR""
+fi
+
 sleep 5
 
 chmod +x WorkerCoordinator.exe