Merge branch 'development' into TIF/Runtime

scripts/build/Platform/Windows/build_config.json

@@ -59,7 +59,7 @@
     "COMMAND": "python_windows.cmd",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/ci_build_metrics.py",
-      "SCRIPT_PARAMETERS": "--platform Windows --jobname \"!JOB_NAME!\" --jobnumber \"!BUILD_NUMBER!\" --jobnode \"!NODE_NAME!\" --changelist \"!CHANGE_ID!\""
+      "SCRIPT_PARAMETERS": "--platform Windows --jobname \"!JOB_NAME!\" --jobnumber \"!BUILD_NUMBER!\" --jobnode \"!NODE_LABEL!\" --changelist \"!CHANGE_ID!\""
     }
   },
   "windows_packaging_all": {

scripts/build/Platform/Windows/build_ninja_windows.cmd

@@ -12,19 +12,10 @@ REM
 
 SETLOCAL EnableDelayedExpansion
 
-IF NOT EXIST "%LY_NINJA_PATH%" (
-    SET LY_NINJA_PATH=%LY_3RDPARTY_PATH%/ninja/1.10.1/Windows
-)
-IF NOT EXIST "%LY_NINJA_PATH%" (
-    ECHO [ci_build] FAIL: LY_NINJA_PATH=%LY_NINJA_PATH%
-    GOTO :error
-)
-PATH %LY_NINJA_PATH%;%PATH%
-
 CALL "%~dp0build_windows.cmd"
 IF NOT %ERRORLEVEL%==0 GOTO :error
 
 EXIT /b 0
 
 :error
-EXIT /b 1
+EXIT /b 1

scripts/build/Platform/Windows/env_windows.cmd

@@ -12,17 +12,8 @@ REM
 
 where /Q cmake
 IF NOT %ERRORLEVEL%==0 (
-    IF "%LY_CMAKE_PATH%"=="" (SET LY_CMAKE_PATH=%LY_3RDPARTY_PATH%/CMake/3.19.1/Windows/bin)
-    IF NOT EXIST !LY_CMAKE_PATH! (
-        ECHO [ci_build] CMake path not found
-        GOTO :error
-    )
-    PATH !LY_CMAKE_PATH!;!PATH!
-    where /Q cmake
-    IF NOT !ERRORLEVEL!==0 (
-        ECHO [ci_build] CMake not found
-        GOTO :error
-    )
+    ECHO [ci_build] CMake not found
+    GOTO :error
 )
 
 EXIT /b 0