birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,478 Commits 3 Branches 3 Tags
670777f0f2c8deba90f9bbba5f45d072064aef7a
Commit Graph

651 Commits

Author SHA1 Message Date
Esteban Papp d46bd0ebc0 Removes special Android case, those files where palified properly 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-25 16:27:40 -08:00
Esteban Papp 6fad254b59 Merge branch 'development' into optimization/unused_files 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/IEditorImpl.cpp
#	Code/Editor/IEditorImpl.h
#	Gems/LmbrCentral/Code/Tests/lmbrcentral_editor_tests_files.cmake
 2022-01-25 15:40:30 -08:00
dependabot[bot] ad8b142230 Bump urllib3 in /scripts/build/build_node/Platform/Common (#7118) 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.2 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.26.2...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-25 08:31:18 -08:00
Chris Galvan a2db9806a8 Merge pull request #7123 from aws-lumberyard-dev/cgalvan/gitflow_220124_o3de_development 
Merged `stabilization/2111RTE` to `development`
 2022-01-25 08:19:34 -06:00
dependabot[bot] a3fbcae81f Bump urllib3 in /scripts/build/build_node/Platform/Linux (#7119) 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.4 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.26.4...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-24 14:47:38 -08:00
Chris Galvan 049b33d2df Merging stabilization/2111RTE -> development, resolved conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-24 15:55:31 -06:00
Junbo Liang 1cf7d57b3f Update deployment scripts to support AWSI automation tests on Linux (#7038) 
* Update deployment scripts to support AWSI automation tests on Linux

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
 2022-01-24 11:20:15 -08:00
lumberyard-employee-dm 1f7040c6b8 Updating mock calls in unit_test_manifest.py to fix test (#7090) 
The manifest.py `get_all_templates` method was modified to add a call to
`get_all_gems` and `get_gem_templates`.
Those calls were not mocked, so they tried to load an o3de_manifest.json
file that was on user's machine, which failed on the CI node.

Also added a mock call for `load_o3de_manifest`, that validates that it
is not called to catch this issue during Automated Review.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-21 18:28:13 -06:00
Esteban Papp 29b3cf4fee Fixes to the unused script 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-21 15:29:42 -08:00
Esteban Papp a145d3c82f Issues/install missing assets (#7081) 
* Fixes for missing assets in the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* delayed expansion to try to fix project_engineinstall_profile

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Improvements to build scripts to solve the project build from the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-21 15:07:27 -08:00
Alex Peterson 1909e5fa54 Handle case where engine.json missing or corrupt (#7049) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2022-01-21 13:09:09 -08:00
Scott Romero 807464c58d [development] updated Android build node configuration (#7007) 
Added the NDK to the install list
Removed Android Java APIs prior to 28 from package list as they are unnecessary
Updated LY_NDK_DIR to point to the SDK manager version
Updated some inconsistencies in how the min Android native API is handled

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2022-01-21 09:08:24 -08:00
Esteban Papp ef9e95c1db More improvements to the unused_compilation script 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 16:09:41 -08:00
Shirang Jia 858a92f394 Deduplicate Jenkins parameters (#7035) 
Signed-off-by: Shirang Jia <shiranj@amazon.com>
 2022-01-20 15:47:53 -08:00
Esteban Papp 4ca4bb3618 some more exclussions 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:27:02 -08:00
Esteban Papp b4cbffed06 More filters 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:25:24 -08:00
Esteban Papp 7ee0a0454e more filters/using reverse on this node 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:24:17 -08:00
Esteban Papp 893f50355f cleanup script updates 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:23:16 -08:00
Esteban Papp f0b86ab1df cleanup script updates 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:23:05 -08:00
Esteban Papp 4cc54941c7 Cleanup before merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:21:39 -08:00
Esteban Papp 2de27a6d08 some more exclussions 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:02:16 -08:00
Esteban Papp bbec1b5242 more exclusions for unused_compilation 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:02:11 -08:00
Esteban Papp 6876cfda30 More filters 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:02:07 -08:00
Esteban Papp 5f55815fca more filters/using reverse on this node 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:02:02 -08:00
Esteban Papp 7c301ef762 cleanup script updates 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:01:58 -08:00
Esteban Papp 507a305f67 Cleanup before merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 15:01:53 -08:00
Esteban Papp 6be0543fc1 Adds script to brute-force detect unused files 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 14:49:57 -08:00
Steve Pham 59e43813f0 GCC Support for Linux 
Updates and fixes to support GCC for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-20 13:00:02 -08:00
Alex Peterson 66f0f1cf5a Duplicate engine detection and help in Project Manager (#6984) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2022-01-19 17:55:05 -08:00
amzn-phist 2a9990ead3 Fix engine template issue (#6927) 
* fix get_enabled_gem_cmake_file to work with "Dem" or "Code" or "Gem/Code" folder in a project
fix o3de_restricted_path to make the past paramter optional

Signed-off-by: byrcolin <byrcolin@amazon.com>

* Fix resolution of variables in `cmake_path(COMPARE)` calls in PAL.cmake

The documentation for `cmake_path(COMPARE)` states that parameters marked as [<input>](https://cmake.org/cmake/help/latest/command/cmake_path.html#conventions) are string literals.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

Co-authored-by: byrcolin <byrcolin@amazon.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-18 08:27:06 -08:00
AMZN-byrcolin c778606c89 Templates restricted (#6498) 
* Templates/Restricted upgrade/fixes:
Fixed template storage format: templates now only store true relative paths and no longer save "origin" paths and "optional" has been removed, it was never used.
Upgraded all templates to new standard
Template system now correctly handles child objects: Child objects no longer have to specify restricted they inherit from parent
Restricted now operates at the object level and makes no assumptions about parent
Restricted templates can now be combined and seperated on creation
ly_get_list_relative_filename has been deprecated for o3de_pal_dir
All Gems/Projects/Templates updated to use new code

Signed-off-by: byrcolin <byrcolin@amazon.com>
 2022-01-14 10:27:20 -08:00
Alex Peterson 73419387c5 Check engines_path in get_registered (#6828) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2022-01-11 16:49:59 -08:00
lumberyard-employee-dm f09055af42 Fixed CMake use with Android NDK 23 (#6460) 
* Fixed CMake use with Android NDK 23

This was done by only setting the `ANDROID_ARM_MODE` if the ANDROID_ABI
starts with `armeabi`.

The Android arm mode setting can't be used using non-`armeabi` ABIs.
In O3DE we default to `arm64-v8a` `ANDROID_ABI`
So `ANDROID_ARM_MODE` must not be set.

The CMake [Android-Determine.cmake](https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/Platform/Android-Determine.cmake#L573-585) which is used to detect platform-wide information when the CMAKE_SYSTEM_NAME is set to android, enforces that if the `CMAKE_ANDROID_ARCH_ABI` doesn't start with `armeabi`, then it will fatal error if the CMAKE_ANDROID_ARM_MODE option is set.

In Android NDK 21 the `ANDROID_ARM_MODE` variable is used to set the CMAKE_ANDROID_ARM_MODE variable if the [ANDROID_ABI](https://android.googlesource.com/platform/ndk/+/refs/tags/ndk-r21e/build/cmake/android.toolchain.cmake#700) starts with `armeabi`.

This meant when using Android NDK 21, the CMake Android-Determine.cmake module would succeed, due
to the CMAKE_ANDROID_ARM_MODE not being set.

In Android NDK 23 the `ANDROID_ARM_MODE` now will set the
`CMAKE_ANDROID_ARM_MODE` variable to `TRUE` if it isn't defined.

Added an `--extra-cmake-configure-args` option to the `generate_android_project.py` script which can be used to append user specified CMake arguments to the cmake configure step (`cmake -B <build-dir> -S <source-dir> -DCMAKE_TOOLCHAIN_FILE=<android-toolchain-file> <extra-args>`)

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the O3DE Android toolchain wrapper to fatal error if the 64-bit
arm ABI isn't used.

Also removed the unneccessary setting of the ANDROID_ARM_MODE and
ANDROID_ARM_NEON option option now that the armeabi cannot be specified
as an ABI.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-10 19:11:00 -06:00
Esteban Papp 0f7e55cf59 Some fixes for paths with spaces (#6757) 
* Some fixes for paths with spaces

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* PR comments

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-10 10:00:29 -08:00
Junbo Liang 67a89c6cd0 Fix an issue where npm is not found (#6706) 
Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
 2022-01-07 10:51:08 -08:00
Mike Chang 6a171d1769 Windows installer build tag date fix (#6735) 
Makes the % string replacement optional in the palSh function

Signed-off-by: Mike Chang <changml@amazon.com>
 2022-01-06 16:41:35 -08:00
Esteban Papp 54e0b8b7b5 Enabling mac tests (#6716) 
* Adds mac test job

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Points to sysctl properly to handle zsh

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes some macos differences with Linux when reading the CTEST_RUN_FLAGS parameters

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* adding the test job to the profile pipe

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Disables some tests in Mac that are not passing

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* passes config to cli_test_driver and sets the right trait for the test (pytest instead of lytesttools)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Set proper traits for AtomRHI

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Corrected AZ_TRAIT_UNIT_TEST_PERLINE_GRADIANT_GOLDEN_VALUES_7878 values for Mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Disables EMotionFX tests in Mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes debugging prints

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes filters that were meant just for Linux

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* quotes are re-quoted in the test_mac.sh script

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-06 16:16:48 -08:00
Esteban Papp 741a9059f6 More packaging cleanup (#6728) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-06 12:13:23 -08:00
Shirang Jia 1d0cd46cb7 Escape % for windows batch in palSh (#6688) 
Signed-off-by: Shirang Jia <shiranj@amazon.com>
 2022-01-05 09:54:52 -08:00
evanchia 0f2e33af68 Changed test artifact upload check 
Signed-off-by: evanchia <evanchia@amazon.com>
 2022-01-03 16:48:20 -08:00
Junbo Liang 75476032ab Define AWSI automation tests pipe for Jenkins (#6518) 
* Define AWSI automation tests pipe for Jenkins

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
 2022-01-03 11:59:03 -08:00
Mike Chang ce709b99d0 Development dockerfile for Linux (#6532) 
This is the initial Dockerfile used for local development or for remote CI environments for Ubuntu. Build and test instructions are in the Dockerfile comments.

Signed-off-by: Mike Chang <changml@amazon.com>
 2021-12-22 14:58:31 -08:00
dependabot[bot] a4df91b718 Bump pyyaml in /scripts/build/build_node/Platform/Common (#6514) 
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.3.1 to 5.4.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](https://github.com/yaml/pyyaml/compare/5.3.1...5.4)

---
updated-dependencies:
- dependency-name: pyyaml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-20 17:38:47 -08:00
Junbo Liang 9ee60e6eba AWSI automation tests support on Linux (#6278) 
* AWSI automation tests support on Linux

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
 2021-12-20 12:15:52 -08:00
nggieber 3cf85bb562 Fix project properties test 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 14:12:14 -08:00
nggieber 88b78c0d16 Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-10 06:32:14 -08:00
Shirang Jia cc242b2239 Fix pipeline name passed to post ar build sns (#6305) 
Signed-off-by: Shirang Jia <shiranj@amazon.com>
 2021-12-09 18:16:19 -08:00
Sean Sweeney c6e06a64ca Merge pull request #6264 from aws-lumberyard-dev/upload_test_artifacts 
Modified Jenkinsfile to upload test artifacts on failure
 2021-12-09 15:23:13 -08:00
evanchia 2db4927f73 added clarifying comment 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-12-09 14:05:30 -08:00
evanchia 117939f605 fixed env var check 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-12-09 11:24:18 -08:00