Commit Graph

634 Commits (ec47c4fdfc93bddacdb4a45f6ac3dd4c78e9e1d4)

Author SHA1 Message Date
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>
4 years ago
Chris Galvan a2db9806a8
Merge pull request #7123 from aws-lumberyard-dev/cgalvan/gitflow_220124_o3de_development
Merged `stabilization/2111RTE` to `development`
4 years ago
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>
4 years ago
Chris Galvan 049b33d2df Merging stabilization/2111RTE -> development, resolved conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
Alex Peterson 1909e5fa54
Handle case where engine.json missing or corrupt (#7049)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
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
4 years ago
Shirang Jia 858a92f394
Deduplicate Jenkins parameters (#7035)
Signed-off-by: Shirang Jia <shiranj@amazon.com>
4 years ago
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>
4 years ago
Alex Peterson 66f0f1cf5a
Duplicate engine detection and help in Project Manager (#6984)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
Alex Peterson 73419387c5
Check engines_path in get_registered (#6828)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
Junbo Liang 67a89c6cd0
Fix an issue where npm is not found (#6706)
Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
Esteban Papp 741a9059f6
More packaging cleanup (#6728)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Shirang Jia 1d0cd46cb7
Escape % for windows batch in palSh (#6688)
Signed-off-by: Shirang Jia <shiranj@amazon.com>
4 years ago
evanchia 0f2e33af68 Changed test artifact upload check
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
nggieber 3cf85bb562 Fix project properties test
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
4 years ago
nggieber 88b78c0d16 Merge branch 'development' into Prism/RefactorProjectSettings 4 years ago
Shirang Jia cc242b2239
Fix pipeline name passed to post ar build sns (#6305)
Signed-off-by: Shirang Jia <shiranj@amazon.com>
4 years ago
Sean Sweeney c6e06a64ca
Merge pull request #6264 from aws-lumberyard-dev/upload_test_artifacts
Modified Jenkinsfile to upload test artifacts on failure
4 years ago
evanchia 2db4927f73 added clarifying comment
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
evanchia 117939f605 fixed env var check
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
evanchia 73ca596c35 added env var check for test artifact upload
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
evanchia 4d3a6169cb removing the jobname from test artifact upload directory
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
Shirang Jia 6e6845dbf3
Pass pipeline name to post ar build sns topic (#6274)
Signed-off-by: Shirang Jia <shiranj@amazon.com>
4 years ago
lumberyard-employee-dm 003727ca57
Fixed the get_registration.py script to print the manifest data (#6236)
Added a --project-engine-name/-pen argument to print_registration.py to
output the engine registered with the project.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
evanchia 4992bce4c2 Modified Jenkinsfile to upload test artifacts on failure
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
Esteban Papp cd5306febf Merging from development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
nggieber 2c1f0220ec Merge branch 'development' into Prism/RefactorProjectSettings 4 years ago
lumberyard-employee-dm 83cb085a28
Fixed the register.py command with a --project-path to check against a (#6158)
supplied --engine-path parameter to determine if it should update the
project.json if one has been provided.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
nggieber 15237af23c Refactored ProjectManagerSettings, added tests, changed project built successful to be tracked by project path, added project ids, changed project settings path to use project id and name
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
4 years ago
Esteban Papp b1eeebb6b6 Removes some leftover log
More Linux fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 03adf700fe Merge branch 'development' into redcode/driller_removal
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp dc52140569 Fixes the diff detection of cmd in linux and mac
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Sean Sweeney 3c189bdb9a
Merge pull request #6076 from aws-lumberyard-dev/disable_unused_testresults
disabling unused test results jobs
4 years ago
Mike Chang 8b3c76d8b8
Add platform specific codesign script and modifications for Linux and Windows installer packaging (#5893)
Signed-off-by: Mike Chang <changml@amazon.com>
4 years ago
evanchia 7e8822b1a8 disabling unused test results jobs
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
Esteban Papp 1a46f548a7
Remove unused scripts/build/package (#5885)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Shirang Jia 58be7c27ed
Make scrubber/validator not depend on legacy packaging scripts (#6053)
* Make validator not depend on legacy packaging scripts

Signed-off-by: Shirang Jia <shiranj@amazon.com>

* Remove unused glob_to_regex.py

Signed-off-by: Shirang Jia <shiranj@amazon.com>

* Remove unsued import path

Signed-off-by: Shirang Jia <shiranj@amazon.com>
4 years ago