Commit Graph

281 Commits

Author SHA1 Message Date
John 992e8500ea Add snapshot selection to PR and non-PR builds.
PR builds will detect the destination branch and check if that branch
is one of the snapshot branches, otherwise it defaults to the 'development'
snapshot.

Non-PR builds use the user-selected snapshot from the list of available
snapshots.

Signed-off-by: John <jonawals@amazon.com>
2021-06-29 17:43:28 +01:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05:00
greerdv b69b6af305 add copyright notice 2021-06-21 22:28:50 +01:00
greerdv 40a84c3c74 add editor python script to help with migrating levels with non-uniform scale 2021-06-21 20:09:48 +01:00
amzn-hdoke 556d607a5e Make AWSCore.Editor tests windows only (#1410) 2021-06-18 16:30:49 -07:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
John e4d4f8555b Merge branch 'development' into TIF/Runtime 2021-06-18 10:15:04 +01:00
Esteban Papp 96da6c6438 LYN-3244 Remove ebp_sanity_smoke_no_gpu (#1386) 2021-06-17 14:36:09 -07:00
lumberyard-employee-dm 7dabe8b6e9 Updated Several Engine Gem's CMakeLists.txt to add themselves as required Gems (#1262)
* Fixed organization of the AssetProcessor SourceAssetBrowser

Assets within the Engine Root were grouped under a '/' entry.
That has been fixed to use the relative path within the engine root for
those assets
Assets outside of the Engine Root, but on the same drive were using
absolute paths before. Now there are child entries that navigate up the
directory hierarchy to those asset locations

* Added ly_enable_gems call to Atom gems targets that are required

The DefaultLevel.prefab contains several Atom components, that require
the Atom RHI, RPI, Common_Feature, ShaderBuilder and AtomLyIntegration CommonFeatures
gems to be enabled in order to successfully process in the
AssetProcessor.

* Added ly_enable_gems call to make the Camera gem required in Tools,
Builders and Clients.

This is needed as the DefaultLevel.prefab contains an Editor Camera
Component

* Adding the ly_enable_gem call to make the Maestro gem required

CrySystem currently requires Maestro to be enabled in order to
initialize

* Added ly_enable_gems call to the SceneProcessing gem to make it required

The SceneCore and SceneData libraries that are part of the core engine
Code folder requires the SceneProcessing gem to be enabled in order to
invoke the InitializeDynamicModule hooks in DllMain.cpp in order to
initialize those libraries.

* Fixed bad argument in comment for Prefab CMakeLists.txt

* Fixed Assert in Asset Builders due to the Atom RPI Builder

The Atom RPI Builder was enabling the Asset Catalog for the ScriptAsset a second time

The Atom Feature Common EditorSystemCommonComponent.cpp which also loads
in the AssetBuilder is enabling the Asset Catalog for the ScriptAsset

Added BehaviorContext reflection to the OutputDeviceTransformType enum
to fix the BehaviorContext errors about reflecting a method that returns
such an enum

* Added TypeId output to the JsonDeserializer report message about missing
ClassData

Previously the report callback would indicate that the target type was
missing Serialization class data, but didn't indicate the TypeId of the
target type

* Added support to the ly_enable_gems function to be able to support
0 gems being enabled.

Updated the Install step for CMake to propagate any ly_enable_gems
within a CMakeLists.txt for a target into the generated CMakeLists.txt
that is made for each installed IMPORTED target

* Adding newline to the end of the Camera Gem CMakeLists.txt

* Fixing target TYPE parameter for actual Gem Modules to use the GEM_MODULE tag instead of MODULE

* Reverting change to the DESTINATION directory for the installed CMakeLists.txt to use the relative path to the installed directory

* Adding the Atom_Bootstrap gem as a required gem

The Client and GameLaunchers required the Atom_Bootstrap gem in order to create the NativeWindow
Added Atom_Feature_Common client module as a runtime dependency of the AtomLyIntegration CommonsFeature client module

* Fixed register.py --all-projects-path and --all-gems-path arguments to
NOT register projects or gems that are within a template folder
Fixed reading of old pre-1.0 o3de_manifest.json files where the
"engines" key was a json array

* Changed how the relative target source directory is calculated when that source directroy resides outside of the engine root.
The final dirname component is used with a unique SHA256 has to form a <dirname>-<8 char SHA256> folder for installing files into

* Adding newline to the end of Atom_Bootstrap CMakeLists.txt

* Moving ly_enable_gems variants for Tools and Builders inside of PAL_TRAIT_BUILD_HOST_TOOLS block

* Adding a comment to AWSCore.ResourceMappingTool target to indicate that it is not a GEM_MODULE.
Furthermore it cannot be loaded with the Gem system because the library is in a different directory the executable
2021-06-17 13:58:20 -05:00
evanchia-ly-sdets f0da36a301 Merge pull request #1321 from aws-lumberyard-dev/linux_sanity_fix
fixing linux sanity tests
2021-06-17 09:53:22 -07:00
John 22093f46fc Merge branch 'development' into TIF/Runtime 2021-06-17 11:34:31 +01:00
jromnoa b347257e82 Merge pull request #1295 from aws-lumberyard-dev/Atom/jromnoa/ATOM-14767-update-build-config-and-s3-uploader
ATOM-14767: First PR for s3 uploads on screenshot test failure (AtomSampleViewer & AtomTest depend on this)
2021-06-16 14:51:51 -07:00
John 15bf2d20ed Merge branch 'development' into TIF/Runtime 2021-06-16 17:23:18 +01:00
John a1c6cb80a0 Fix double test failure policy 2021-06-16 17:14:45 +01:00
John e7e68d3ba3 Set test failure policy to continue 2021-06-16 16:21:49 +01:00
John b1508b522f Add build output folder to tiaf driver 2021-06-16 13:25:26 +01:00
John 17ba9f5c4f Force non-gating at script level 2021-06-16 10:09:02 +01:00
lumberyard-employee-dm 4014cacff8 Added a ${GemName}.Builders variant to Asset-Only Gems (#1324)
* Creating Builder variant aliases for all Asset Gems

* Added an AssetGem template for creating an Asset Gem

The AssetGem template is meant for non-code Gems

* Updated the engine_template.py commands to use pathlib

Each of the four commands: create-template, create-from-template,
create-project and create-gem have been updated to use pathlib.Path or
any path manipulation

Fix several python errors when instantiating a template with missing
o3de objects.
For example attempting to use the create-project command with the
"DefaultGem" template would result in a python exception instaed of a
error log and a return value 0..

Added a **force** option to the engine_template commands
to force overriding of existing files

* Optimized search through text files when the create-template command is
run when attempting to replace the license text section

* Adding a Minimal Project Template that contains the minimal set of gems
as stated by UX

* Minor changes to the DefaultProject template. Added a license section to the EngineFinder.cmake

* Adding the MinimalProject to the engine.json file
2021-06-15 20:44:23 -05:00
jromnoa cd69b7c9d6 do 1 print() call for a failed s3_upload_file() call and add a short 100 millisecond sleep between file upload retries 2021-06-15 14:34:44 -07:00
jromnoa fffff75479 add file check for _build_file_paths() function 2021-06-15 13:55:10 -07:00
jromnoa cac210f25b add check for files in a given path before creating full paths to the files, add output when json.loads() call fails 2021-06-15 11:28:58 -07:00
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
John 2606234cfa Merge branch 'main' into TIF/Runtime 2021-06-15 17:32:21 +01:00
evanchia 1f31bac640 fixing linux sanity tests 2021-06-14 20:19:19 -07:00
amzn-hdoke 11c3a75321 Enable Client Auth unit test on Linux (#1312) 2021-06-14 13:54:04 -07:00
jromnoa b2bcd6a326 adds TEST_SCREENSHOTS boolean toggle to build_config.json & adds subdirectory searching for upload_to_s3.py script 2021-06-11 18:12:24 -07:00
amzn-mgwynn 63bb8aa8a9 Merge pull request #1286 from aws-lumberyard-dev/Prism/gem-db
updating missed variable name change in logging call
2021-06-11 17:09:42 -07:00
srikappa-amzn 6d15a0d6e9 Merge branch 'stabilization/2106' into FixLinuxBenchmarks 2021-06-11 16:50:03 -07:00
mgwynn a5cead4414 updating missed variable name change in logging call 2021-06-11 19:05:51 -04:00
amzn-mgwynn 5992c1404b Merge pull request #1259 from aws-lumberyard-dev/Prism/gem-db
Adding unit test for project properties cli
2021-06-11 15:56:14 -07:00
lumberyard-employee-dm fe441b01a0 Split the new_tags and delete_tags paramaters if they are strings on spaces. 2021-06-11 15:04:51 -05:00
lumberyard-employee-dm 3127bf7477 Making sure the expected tag set exactly matches the "user_tags" in the project_json 2021-06-11 15:02:15 -05:00
mgwynn 0b3a56d031 Incorporating review comments. Adding checks for json contents. Added class. Minor reformatting. 2021-06-11 15:01:33 -04:00
srikappa-amzn bf1b800136 minor change to order of if and foreach 2021-06-11 10:25:28 -07:00
Eric Phister 0c7605c9b6 Update minimum required CMake version to 3.20 (#1253)
* Update the minimum CMake version to 3.20

Sets the cmake_minimum_required calls to version 3.20 and updates the
README.md to point at the general CMake download page instead of a stale
link.

* Remove unnecessary cmake minimum version

It was using an old 3.0 version and can be removed.

* Additional updates to CMake 3.20, build scripts

Updates the version and remove logic to find a CMake in 3rdParty.

* Removing backup path to ninja path in the build_ninja_windows.cmd

The backup path for finding ninja was coming from the Perforce depot which isn't available for o3de builds.

* Removing reference to 3rdParty Android SDK 29 from the build and run unit test script

The Android SDK is not part of the new 3rdParty system and users are expected to install the Android SDK on their own in order to build the engine for Android.

* Update the get_python scripts and README

No longer try to append a CMake path to LY_3RDPARTY_PATH, but do still
support LY_CMAKE_PATH because there are still uses of it.  Remove
mention of an LY_3RDPARTY_PATH-relative CMake path from the README.md.

* Removing LY_NINJA_PATH from the build_ninja_windows.cmd

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-11 12:00:55 -05:00
hultonha 2d41a701af Merge branch 'stabilization/2106' into tomhh_stabilization-to-development 2021-06-11 09:43:11 +01:00
mgwynn e80ba41bdd Adding project properties test to cmakeLists 2021-06-10 22:08:05 -04:00
mgwynn d029ba894e Added failure condition for fail case test 2021-06-10 21:24:27 -04:00
mgwynn 9a61557932 Adding unit test for project properties cli 2021-06-10 21:17:24 -04:00
Mike Chang 01847ef6dd Changed mac and ios node label
This changes the Mac and iOS job AMI that we're using to Big Sur (OSX 11.4 update). This includes the following based on https://github.com/aws-lumberyard/o3de/tree/development/scripts/build/build_node/Platform/Mac:

- XCode 12.4
- CMake 3.20.3

Note: As of 86136dd, these builds still fail with the same errors as the nightly build under Catalina. See SPEC-7273 and LYN-4071 for details
2021-06-10 17:24:14 -07:00
srikappa-amzn bbae6490d9 Enabled LyTestTools trait only for windows and mac 2021-06-10 14:38:14 -07:00
amzn-sj 607f32fae6 No need to check if the first character is a number. This is already validated before. 2021-06-10 13:34:16 -07:00
amzn-sj 2ee4d8ff6b Sanitize identifier names before substituting them in C++ template files 2021-06-10 11:01:23 -07:00
John 169d4da288 Address PR comments 2021-06-10 14:54:46 +01:00
lumberyard-employee-dm 88d16b23d4 Fixing the enable_gem.py and disable_gem.py commands (#1207) (#1220)
* Fixing the enable_gem.py and disable_gem.py commands (#1207)

* Fixing the enable_gem.py and disable_gem.py commands
The project path wasn't taking into account when querying for gems,
templates and restricted directories registered with the project

Fixing the cmake.py add_gem_dependency and remove_gem_dependency methods
to properly detect a gem within a `set(ENABLED_GEM ...)` cmake variable
Also updated the add_gem_dependency to add the gem right before the end
marker of ')'
Updated the remove_gem_dependency to remove each instance of a gem with
a content that is in between in the `set(ENABLED_GEM ...)` cmake
variable

* Correct Typo in manifest.get_registered doc string

* Removing second get_all_restricted() method
2021-06-09 18:50:28 -05:00
amzn-sj 6c056ad566 Remove duplicate definition of function 2021-06-09 15:29:39 -07:00
daimini d6d2cbae7e Merge branch 'stabilization/2106' into gitflow_210609 2021-06-09 14:26:29 -07:00
lumberyard-employee-dm 217eddc8bd Fixing the enable_gem.py and disable_gem.py commands (#1207)
* Fixing the enable_gem.py and disable_gem.py commands
The project path wasn't taking into account when querying for gems,
templates and restricted directories registered with the project

Fixing the cmake.py add_gem_dependency and remove_gem_dependency methods
to properly detect a gem within a `set(ENABLED_GEM ...)` cmake variable
Also updated the add_gem_dependency to add the gem right before the end
marker of ')'
Updated the remove_gem_dependency to remove each instance of a gem with
a content that is in between in the `set(ENABLED_GEM ...)` cmake
variable

* Correct Typo in manifest.get_registered doc string
2021-06-09 14:14:01 -05:00
jonawals fdbc15b195 Fix missing args for tiaf driver 2021-06-09 10:00:53 +01:00
jonawals d44a20f470 Add flag for non-seed sequence test failure policy 2021-06-09 08:59:11 +01:00