birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into LoadPipelineFromGitHub

Browse Source
This commit is contained in:
Brian Herrera
2021-03-26 17:05:57 -07:00
parent e8bbb5a0d5 cfd7789a49
commit 39f53338bf
765 changed files with 11513 additions and 20246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/build/JenkinsScripts/build/Platform/Android/build_config.json
+13 -5
View File
@@ -1,4 +1,13 @@
{
"profile_pipe": {
"TAGS": [
"default"
],
"steps": [
"profile",
"gradle"
]
},
"metrics": {
"TAGS":[
"weekly"
@@ -11,7 +20,7 @@
},
"debug": {
"TAGS":[
"default",
"nightly",
"weekly-build-metrics"
],
"COMMAND":"../Windows/build_ninja_windows.cmd",
@@ -26,7 +35,6 @@
},
"profile": {
"TAGS":[
"default",
"weekly-build-metrics",
"daily-pipeline-metrics"
],
@@ -42,7 +50,7 @@
},
"profile_nounity": {
"TAGS":[
"default",
"nightly",
"weekly-build-metrics"
],
"COMMAND":"../Windows/build_ninja_windows.cmd",
@@ -95,6 +103,7 @@
},
"release": {
"TAGS":[
"nightly",
"weekly-build-metrics"
],
"COMMAND":"../Windows/build_ninja_windows.cmd",
@@ -109,7 +118,7 @@
},
"monolithic_release": {
"TAGS":[
"default",
"nightly",
"weekly-build-metrics"
],
"COMMAND":"../Windows/build_ninja_windows.cmd",
@@ -124,7 +133,6 @@
},
"gradle": {
"TAGS":[
"default",
"weekly-build-metrics"
],
"COMMAND":"gradle_windows.cmd",
Tools/build/JenkinsScripts/build/Platform/Android/gradle_windows.cmd
+2 -2
View File
@@ -76,8 +76,8 @@ IF NOT EXIST %TMP% (
mkdir temp
)
SET PYTHON=python\python.cmd
ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --dev-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_HOME% --cmake-install-path=%CMAKE_HOME% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --android-ndk-path=%LY_ANDROID_NDK% --android-sdk-path=%LY_ANDROID_SDK% --android-ndk-version=%ANDROID_NDK_PLATFORM% --android-sdk-version=%ANDROID_SDK_PLATFORM%
CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --dev-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_HOME% --cmake-install-path=%CMAKE_HOME% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --android-ndk-path=%LY_ANDROID_NDK% --android-sdk-path=%LY_ANDROID_SDK% --android-ndk-version=%ANDROID_NDK_PLATFORM% --android-sdk-version=%ANDROID_SDK_PLATFORM%
ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --project-path=%GAME_PROJECT% --engine-root=. --build-dir=%OUTPUT_DIRECTORY% --gradle-install-path=%GRADLE_HOME% --cmake-install-path=%CMAKE_HOME% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --android-ndk-path=%LY_ANDROID_NDK% --android-sdk-path=%LY_ANDROID_SDK% --android-ndk-version=%ANDROID_NDK_PLATFORM% --android-sdk-version=%ANDROID_SDK_PLATFORM%
CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --project-path="%GAME_PROJECT%" --engine-root=. --build-dir="%OUTPUT_DIRECTORY%" --gradle-install-path="%GRADLE_HOME%" --cmake-install-path="%CMAKE_HOME%" --ninja-install-path="%LY_NINJA_PATH%" --third-party-path="%LY_3RDPARTY_PATH%" --android-ndk-path="%LY_ANDROID_NDK%" --android-sdk-path="%LY_ANDROID_SDK%" --android-ndk-version=%ANDROID_NDK_PLATFORM% --android-sdk-version=%ANDROID_SDK_PLATFORM%
IF NOT %ERRORLEVEL%==0 GOTO :error
PUSHD %OUTPUT_DIRECTORY%
Tools/build/JenkinsScripts/build/Platform/Linux/asset_linux.sh
+2 -2
View File
@@ -34,8 +34,8 @@ fi
for project in $(echo $CMAKE_LY_PROJECTS | sed "s/;/ /g")
do
echo [ci_build] ${ASSET_PROCESSOR_BINARY} $ASSET_PROCESSOR_OPTIONS --gamefolder=$project --platforms=$ASSET_PROCESSOR_PLATFORMS
${ASSET_PROCESSOR_BINARY} $ASSET_PROCESSOR_OPTIONS --gamefolder=$project --platforms=$ASSET_PROCESSOR_PLATFORMS
echo [ci_build] ${ASSET_PROCESSOR_BINARY} $ASSET_PROCESSOR_OPTIONS --project-path=$project --platforms=$ASSET_PROCESSOR_PLATFORMS
${ASSET_PROCESSOR_BINARY} $ASSET_PROCESSOR_OPTIONS --project-path=$project --platforms=$ASSET_PROCESSOR_PLATFORMS
done
popd
Tools/build/JenkinsScripts/build/Platform/Linux/build_config.json
+14 -9
View File
@@ -1,12 +1,11 @@
{
"profile_pipe": {
"TAGS": [
"default",
"weekly-build-metrics",
"daily-pipeline-metrics"
"default"
],
"steps": [
"profile",
"asset_profile",
"test_profile"
]
},
@@ -22,7 +21,7 @@
},
"debug": {
"TAGS": [
"default",
"nightly",
"weekly-build-metrics"
],
"COMMAND": "build_linux.sh",
@@ -35,7 +34,10 @@
}
},
"profile": {
"TAGS": [],
"TAGS": [
"daily-pipeline-metrics",
"weekly-build-metrics"
],
"COMMAND": "build_linux.sh",
"PARAMETERS": {
"CONFIGURATION": "profile",
@@ -47,7 +49,7 @@
},
"profile_nounity": {
"TAGS": [
"default",
"nightly",
"weekly-build-metrics"
],
"COMMAND": "build_linux.sh",
@@ -60,7 +62,10 @@
}
},
"test_profile": {
"TAGS": [],
"TAGS": [
"daily-pipeline-metrics",
"weekly-build-metrics"
],
"COMMAND": "build_test_linux.sh",
"PARAMETERS": {
"CONFIGURATION": "profile",
@@ -73,7 +78,6 @@
},
"asset_profile": {
"TAGS": [
"default",
"weekly-build-metrics"
],
"COMMAND": "build_asset_linux.sh",
@@ -139,6 +143,7 @@
},
"release": {
"TAGS": [
"nightly",
"weekly-build-metrics"
],
"COMMAND": "build_linux.sh",
@@ -152,7 +157,7 @@
},
"monolithic_release": {
"TAGS": [
"default",
"nightly",
"weekly-build-metrics"
],
"COMMAND": "build_linux.sh",
Tools/build/JenkinsScripts/build/Platform/Mac/asset_mac.sh
+2 -2
View File
@@ -34,8 +34,8 @@ fi
for project in $(echo $CMAKE_LY_PROJECTS | sed "s/;/ /g")
do
echo [ci_build] ${ASSET_PROCESSOR_BINARY} $ASSET_PROCESSOR_OPTIONS --gamefolder=$project --platforms=$ASSET_PROCESSOR_PLATFORMS
${ASSET_PROCESSOR_BINARY} $ASSET_PROCESSOR_OPTIONS --gamefolder=$project --platforms=$ASSET_PROCESSOR_PLATFORMS
echo [ci_build] ${ASSET_PROCESSOR_BINARY} $ASSET_PROCESSOR_OPTIONS --project-path=$project --platforms=$ASSET_PROCESSOR_PLATFORMS
${ASSET_PROCESSOR_BINARY} $ASSET_PROCESSOR_OPTIONS --project-path=$project --platforms=$ASSET_PROCESSOR_PLATFORMS
done
popd
Tools/build/JenkinsScripts/build/Platform/Mac/build_config.json
+7 -4
View File
@@ -1,8 +1,7 @@
{
"profile_pipe": {
"TAGS": [
"nightly",
"weekly-build-metrics"
"nightly"
],
"steps": [
"profile",
@@ -35,7 +34,8 @@
},
"profile": {
"TAGS": [
"daily-pipeline-metrics"
"daily-pipeline-metrics",
"weekly-build-metrics"
],
"COMMAND": "build_mac.sh",
"PARAMETERS": {
@@ -61,7 +61,9 @@
}
},
"asset_profile": {
"TAGS": [],
"TAGS": [
"weekly-build-metrics"
],
"COMMAND": "build_asset_mac.sh",
"PARAMETERS": {
"CONFIGURATION": "profile",
@@ -125,6 +127,7 @@
},
"release": {
"TAGS": [
"nightly",
"weekly-build-metrics"
],
"COMMAND": "build_mac.sh",
Tools/build/JenkinsScripts/build/Platform/Windows/asset_windows.cmd
+2 -2
View File
@@ -33,8 +33,8 @@ IF NOT EXIST %ASSET_PROCESSOR_BINARY% (
)
FOR %%P in (%CMAKE_LY_PROJECTS%) do (
ECHO [ci_build] %ASSET_PROCESSOR_BINARY% %ASSET_PROCESSOR_OPTIONS% --gamefolder=%%P --platforms=%ASSET_PROCESSOR_PLATFORMS%
%ASSET_PROCESSOR_BINARY% %ASSET_PROCESSOR_OPTIONS% --gamefolder=%%P --platforms=%ASSET_PROCESSOR_PLATFORMS%
ECHO [ci_build] %ASSET_PROCESSOR_BINARY% %ASSET_PROCESSOR_OPTIONS% --project-path=%%P --platforms=%ASSET_PROCESSOR_PLATFORMS%
%ASSET_PROCESSOR_BINARY% %ASSET_PROCESSOR_OPTIONS% --project-path=%%P --platforms=%ASSET_PROCESSOR_PLATFORMS%
IF NOT !ERRORLEVEL!==0 GOTO :popd_error
)
Tools/build/JenkinsScripts/build/Platform/Windows/build_config.json
+30 -20
View File
@@ -9,8 +9,7 @@
},
"debug_vs2019_pipe": {
"TAGS": [
"default",
"weekly-build-metrics"
"nightly"
],
"steps": [
"debug_vs2019",
@@ -19,9 +18,7 @@
},
"profile_vs2019_pipe": {
"TAGS": [
"default",
"daily-pipeline-metrics",
"weekly-build-metrics"
"default"
],
"steps": [
"profile_vs2019",
@@ -30,7 +27,9 @@
]
},
"scrubbing": {
"TAGS": [],
"TAGS": [
"weekly-build-metrics"
],
"COMMAND": "python_windows.cmd",
"PARAMETERS": {
"SCRIPT_PATH": "Tools/build/JenkinsScripts/build/scrubbing_job.py"
@@ -38,7 +37,7 @@
},
"validation": {
"TAGS": [
""
"weekly-build-metrics"
],
"COMMAND": "python_windows.cmd",
"PARAMETERS": {
@@ -76,7 +75,9 @@
}
},
"debug_vs2019": {
"TAGS": [],
"TAGS": [
"weekly-build-metrics"
],
"COMMAND": "build_windows.cmd",
"PARAMETERS": {
"CONFIGURATION": "debug",
@@ -88,7 +89,9 @@
}
},
"test_debug_vs2019": {
"TAGS": [],
"TAGS": [
"weekly-build-metrics"
],
"COMMAND": "build_test_windows.cmd",
"PARAMETERS": {
"CONFIGURATION": "debug",
@@ -97,12 +100,14 @@
"CMAKE_LY_PROJECTS": "AutomatedTesting",
"CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
"CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
"CTEST_OPTIONS": "-L \"(SUITE_smoke|SUITE_main)\""
"CTEST_OPTIONS": "-L \"(SUITE_smoke|SUITE_main)\" -T Test"
}
},
"profile_vs2019": {
"TAGS": [
"project"
"project",
"daily-pipeline-metrics",
"weekly-build-metrics"
],
"COMMAND": "build_windows.cmd",
"PARAMETERS": {
@@ -116,7 +121,7 @@
},
"profile_vs2019_nounity": {
"TAGS": [
"default",
"nightly",
"weekly-build-metrics"
],
"COMMAND": "build_windows.cmd",
@@ -130,7 +135,10 @@
}
},
"test_cpu_profile_vs2019": {
"TAGS": [],
"TAGS": [
"daily-pipeline-metrics",
"weekly-build-metrics"
],
"COMMAND": "build_test_windows.cmd",
"PARAMETERS": {
"CONFIGURATION": "profile",
@@ -139,7 +147,7 @@
"CMAKE_LY_PROJECTS": "AutomatedTesting",
"CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
"CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
"CTEST_OPTIONS": "-L \"(SUITE_smoke|SUITE_main)\" -LE \"(REQUIRES_gpu)\""
"CTEST_OPTIONS": "-L \"(SUITE_smoke|SUITE_main)\" -LE \"(REQUIRES_gpu)\" -T Test"
}
},
"test_gpu_profile_vs2019": {
@@ -155,11 +163,13 @@
"CMAKE_LY_PROJECTS": "AutomatedTesting",
"CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
"CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
"CTEST_OPTIONS": "-L \"(SUITE_smoke_REQUIRES_gpu|SUITE_main_REQUIRES_gpu)\""
"CTEST_OPTIONS": "-L \"(SUITE_smoke_REQUIRES_gpu|SUITE_main_REQUIRES_gpu)\" -T Test"
}
},
"asset_profile_vs2019": {
"TAGS": [],
"TAGS": [
"weekly-build-metrics"
],
"COMMAND": "build_asset_windows.cmd",
"PARAMETERS": {
"CONFIGURATION": "profile",
@@ -206,7 +216,7 @@
"CMAKE_LY_PROJECTS": "AutomatedTesting",
"CMAKE_TARGET": "TEST_SUITE_periodic",
"CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
"CTEST_OPTIONS": "-L \"(SUITE_periodic)\""
"CTEST_OPTIONS": "-L \"(SUITE_periodic)\" -T Test"
}
},
"sandbox_test_profile_vs2019": {
@@ -225,7 +235,7 @@
"CMAKE_LY_PROJECTS": "AutomatedTesting",
"CMAKE_TARGET": "TEST_SUITE_sandbox",
"CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
"CTEST_OPTIONS": "-L \"(SUITE_sandbox)\""
"CTEST_OPTIONS": "-L \"(SUITE_sandbox)\" -T Test"
}
},
"benchmark_test_profile_vs2019": {
@@ -241,7 +251,7 @@
"CMAKE_LY_PROJECTS": "AutomatedTesting",
"CMAKE_TARGET": "TEST_SUITE_benchmark",
"CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
"CTEST_OPTIONS": "-L \"(SUITE_benchmark)\""
"CTEST_OPTIONS": "-L \"(SUITE_benchmark)\" -T Test"
}
},
"release_vs2019": {
@@ -261,7 +271,7 @@
},
"monolithic_release_vs2019": {
"TAGS": [
"default",
"nightly",
"weekly-build-metrics"
],
"COMMAND": "build_windows.cmd",
Tools/build/JenkinsScripts/build/Platform/iOS/build_config.json
+7 -12
View File
@@ -1,14 +1,4 @@
{
"profile_pipe": {
"TAGS": [
"nightly",
"weekly-build-metrics"
],
"steps": [
"profile",
"asset_profile"
]
},
"metrics": {
"TAGS": [
"weekly"
@@ -36,7 +26,9 @@
},
"profile": {
"TAGS": [
"daily-pipeline-metrics"
"nightly",
"daily-pipeline-metrics",
"weekly-build-metrics"
],
"COMMAND": "../Mac/build_mac.sh",
"PARAMETERS": {
@@ -64,7 +56,10 @@
}
},
"asset_profile": {
"TAGS": [],
"TAGS": [
"nightly",
"weekly-build-metrics"
],
"COMMAND": "../Mac/build_asset_mac.sh",
"PARAMETERS": {
"CONFIGURATION": "profile",
Tools/build/JenkinsScripts/build/cmake_package.py
+1 -1
View File
@@ -67,7 +67,7 @@ def override_bootstrap_cfg(package_env):
print('Override values in bootstrap.cfg')
engine_root = package_env.get('ENGINE_ROOT')
bootstrap_path = os.path.join(engine_root, 'bootstrap.cfg')
replace_values = {'sys_game_folder':'{}'.format(package_env.get('BOOTSTRAP_CFG_GAME_FOLDER'))}
replace_values = {'project_path':'{}'.format(package_env.get('BOOTSTRAP_CFG_GAME_FOLDER'))}
try:
with open(bootstrap_path, 'r') as bootstrap_cfg:
content = bootstrap_cfg.read()