birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,789 Commits 3 Branches 3 Tags
e080ade885d84fa0bd0852b705dd46670b5e78bf
Commit Graph

579 Commits

Author SHA1 Message Date
AMZN-AlexOteiza aac540c022 Re-enabled prefab tests (#5867) 
* Re-enabled prefab tests

* Added missing lib for linux
 2021-11-29 17:00:48 +00:00
Mike Chang 28e2681b65 Add signer script and new gpg signing cert (#5847) 
* Add signer script and new gpg signing cert

Signed-off-by: Mike Chang <changml@amazon.com>
 2021-11-23 13:41:55 -08:00
Esteban Papp 75bb0f24ad Msbuild warning fix for jenkins (#5818) 2021-11-23 13:16:04 -08:00
Shirang Jia ebd679d8cf Don't fail the build when AP logs upload fails (#5849) 
* Fix retry of failures from catch block

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

* Make the build unstable when AP load fails

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

* Remove test codes

Signed-off-by: Shirang Jia <shiranj@amazon.com>
 2021-11-22 17:46:49 -08:00
Esteban Papp ccb5336843 Reading 3rdparty from manifest if it exists (#5840) 
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace

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

* Removes unneded space

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

* Changes how we get the NDK folder

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

* needs delayed expansion

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

* Ninja is in the path, is not needed for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-22 14:21:02 -08:00
Esteban Papp 7100d48e16 Cherry-picking some changes from stabilization into development (#5810) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-19 15:59:21 -08:00
puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de 
Merge stabilization/2110
 2021-11-19 15:46:16 -08:00
Shirang Jia c0080d6b1f Archive ap logs on s3 (#5620) 
* Archive ap logs on s3

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

* Update copy_file.py

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

* Fix syntax from bad copy

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

* Change underscore in argument name to dash

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

* Add a general ArchiveArtifactsOnS3 function so we can use it to archive any files on S3

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

* Swap order of excludes and includes

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

* Change artifactsSourceDir to artifactsSource since the value can be either a file or a directory

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

* Fix parameter

Signed-off-by: Shirang Jia <shiranj@amazon.com>
 2021-11-19 10:45:09 -08:00
puvvadar 0c1a0391fa Merge commit '77279bfd55396524d3ba00c7b4407237e546035d' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:22 -08:00
puvvadar d056555388 Merge commit 'd30fdb759d07e54d36309680ffa4247f1481ceb2' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:45 -08:00
puvvadar 89235fb546 Merge commit '76d2e125c294e1183ef55320417fa34a6f9d5e27' into puvvadar/gitflow_211118_o3de 2021-11-19 09:15:56 -08:00
lumberyard-employee-dm 77279bfd55 Prevent updates to o3de_manifests.json if it is corrupted. (#5776) 
This behavior can be overridden using the --force option.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-19 11:04:53 -06:00
Alex Peterson d30fdb759d Gem repo template (#5774) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-18 21:27:43 -08:00
Esteban Papp 49e8f35858 Creates a deb package (#5567) 
* configure/generation working

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

* Generates deb package forLinux

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

* Fixes to EngineFinder

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

* changes the owner of the installed folder so it is writable by the user

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

* jenkins scripts

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

* Fixes execution permission for scripts

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

* Fixes wrong parameter to build for linux

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

* removal of clang parameters in build_config.json

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

* Simplifies and fixes build configs

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

* fixes to EngineFinder

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

* Adds linux deb package upload and small fixes/organization cleanup

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

* fixes checksum generation

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

* Some more small fixes for reviewing

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

* Test if this space is necessary for cpack

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

* More fixes for installer jobs

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

* Adding eval to variables that need to double-expand

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

* Removing unused variables being passed

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

* Do not remove symlink

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

* Use cmake_path for concatenating paths

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

* removing quotes so the variable expands

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

* cleaned up some variables that have way too many ways to be passed

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

* Multiple fixes for Jenkins

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

* Cleanup/re-organization

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

* fixes some temp variables so we can run cpack jenkins jobs locally

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

* Delays cmake download to install step
Cleanup on installer_windows.cmd, we already have the path to cpack (same as cmake, which is added to the path)
Some simplification in the windows installer generation, we now generate the same even if we dont upload

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

* Fixes mac install

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

* CPack can generate hashes for us
Defiine CPACK_OUTPUT_FILE_PREFIX to prevent the exe/msi from ending in the bin dir
Remove unnecessary generation of folder from 3rdPartyPacakges which fails when including from cpack

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

* multiple fixes

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

* fixes typo

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

* more fixes

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

* Fixes for linux/mac/windows (fixing discrepancies with Jenkins)

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

* uploads to S3 from the upload directory and fixes the latest upload

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

* Adds ERROR_VARIABLE to S3 upload to find a Jenkins issue

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

* printing command invocation to try to figure out the errors

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

* Changes the hashing algorithm to sha256 and fixes the cmd used to call to pythojn

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

* wrong path being passed in mac

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

* removes compiler parameters from a config job (after rebase)

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

* more fixes fro deb packaging job

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

* small fix for fingerprint patching for latest

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

* Changing extension of public key and leaving better TODO places for code signing

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

* Removes sdl as a dependency, leaving it commented since it is needed for wwise

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

* fixes runtime copy during install, makes it more consistent with regular runtime dependencies and optimizes copy when there is already an install

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

* $ENV{DESTDIR} and CMAKE_INSTALL_PREFIX cannot be used in cmake_path because the CMAKE_INSTALL_PREFIX is absolute

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

* Fixing some runtime_dependencies optimizations, we cannot take size of a bundle

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

* Fixes warning in mac for an unused variable

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

* Fixes a variable that was being passed to fix qt frameworks

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

* More fixes for Jenkins

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

* Updates email to use for maintainer to match certificate

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

* make directory because in some cases the dependency is copied before the actual library and the directory has to be created

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

* Fix for a new warning/error in linux

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

* The sha file is created after the upload happens, so creating it

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

* remove the size comparison for install since it stomps over the copy from the target and doesnt trigger stripping

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-18 16:26:49 -08:00
Mike Chang ed40ed201a Add gpg public key (#5755) 
Signed-off-by: Mike Chang <changml@amazon.com>
 2021-11-18 15:20:07 -08:00
AMZN-Phil 83f42fed5f Change warn to warning to remove deprecation messages from Python 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-18 09:49:05 -08:00
puvvadar 5aee691cd8 Merge commit '78263b7f13bf5d0fac824a4c025c46c88138a59c' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:33 -08:00
puvvadar c192a7e3bb Merge commit 'fc805594d02967474c2e31cd228e925d73310fee' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:55 -08:00
AMZN-Phil 6819a1956d Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-17 10:01:00 -08:00
Tommy Walton 1e42261d76 Merge remote-tracking branch 'upstream/development' into amzn-tommy/gitflow_211116_o3de2 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-11-17 09:04:04 -08:00
AMZN-AlexOteiza e07cb1f2ed Re-enabled linux tests physics (#5701) 
* Re-enabled linux tests physics

* Fix for python load errors on Linux (#5627)

* Explicitly load libpython on Linux

Downstream loads of python modules that weren't linked to libpython would
fail to load because libraries were loaded using the RTLD_LOCAL flag.  This
adds a function that will explicitly load libpython on Linux using the
RTLD_GLOBAL flag.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix misspelled function name

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Addressing PR feedback

- Updates naming and location of things.
- Adds load code to a Gem template.
- Updates error checking.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address further feedback

Removes the api function in favor of just having modules inherit off a
PythonLoader class, that way we get RAAI behavior and lifetime management
for free.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
Signed-off-by: aljanru <aljanru@amazon.co.uk>

Co-authored-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-11-17 14:30:41 +00:00
Alex Peterson fc805594d0 Fixes for misc gem download issues (#5665) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-16 14:51:28 -08:00
AMZN-Phil 808c783109 Show python errors in Project Manager for adding repos and downloading gems 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-16 14:24:02 -08:00
Tommy Walton 6080801c55 Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:35 -08:00
Tommy Walton 830c10b8b0 Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:18 -08:00
Junbo Liang d468cbad85 AWS Core CDK: Add option to cleanup resources that are retained by default (#5470) (#5618) 
* Add option to cleanup resources that are retained by default

Signed-off-by: Pip Potter <61438964+lmbr-pip@users.noreply.github.com>
 2021-11-16 10:33:57 -08:00
sweeneys 80a6658c9d disable TerrainTests 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2021-11-12 16:46:46 -08:00
sweeneys 3ae8f8b199 merge from development 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2021-11-12 14:47:08 -08:00
Nicholas Van Sickle 2c2c1d8137 Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21 
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
 2021-11-11 15:04:18 -08:00
Pip Potter 4a34686e4e AWS Core CDK: Add option to cleanup resources that are retained by default (#5470) 
* Add option to cleanup resources that are retained by default

Signed-off-by: Pip Potter <61438964+lmbr-pip@users.noreply.github.com>
 2021-11-11 13:20:47 -08:00
nggieber 3d21a9f4bd Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 2021-11-11 11:52:49 -08:00
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-11-11 10:15:52 -08:00
AMZN-Phil c07b666bec Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/AdditionalProgressFixes 2021-11-11 08:19:21 -08:00
sweeneys e0c2fd90b1 Disable failing modules, add explicit skip-reason 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2021-11-10 18:56:02 -08:00
sweeneys d93ac7d791 remove ignored modules 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2021-11-10 16:51:33 -08:00
sweeneys c29ca07d54 Enable python-based tests in Linux AR 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2021-11-10 15:34:08 -08:00
nggieber d9443ec42c Addressed some PR feedback and continue filtering with same search string even after refresh 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-10 15:29:20 -08:00
nggieber 2913d72d17 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 2021-11-10 12:49:22 -08:00
nggieber f470351d0c Hook up Gem Updating and Uninstallation and fix lots of minor bugs between gem catalog and gem repos 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-10 12:33:24 -08:00
AMZN-Phil cd2b1fa91c Merge pull request #5503 from aws-lumberyard-dev/Prism/CLIDelFileFolderFix 
Fix trying to remove a cache file
 2021-11-10 12:21:31 -08:00
Mike Chang 5a8f95a414 Fix Wix root and installer url config (#5500) 
Signed-off-by: changml <changml@amazon.com>
 2021-11-10 11:21:49 -08:00
AMZN-Phil f2e191ea77 Fix trying to remove a cache file 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-10 10:28:32 -08:00
Shirang Jia 576248a870 Merge Jenkinsfile from development to stabilization (#5391) 
Signed-off-by: shiranj <shiranj@amazon.com>
 2021-11-10 10:26:44 -08:00
AMZN-Phil 0102894a83 Handle servers with no content length and make downloading more obvious 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-10 08:44:24 -08:00
brianherrera 92f1883cae Remove timeout in the mount step 
We no longer need a timeout here. A timeout mechanism was added to the mount script to raise an exeception if the EBS volume is not mounted in the configured timeframe.

This also causes a bug with the retry mechanism where Jenkins will hit this timeout in the event the node goes offline during the setup stage instead of raising an exception.

Signed-off-by: brianherrera <briher@amazon.com>
 2021-11-09 11:50:01 -08:00
Brian Herrera 770378959a Merge pull request #5450 from aws-lumberyard-dev/retry-failure-fix 
Remove timeout in the mount step
 2021-11-09 11:47:55 -08:00
Esteban Papp 85e9ca4692 Fixes for clang-12 (#5435) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-09 11:09:22 -08:00
AMZN-Phil e9c3a453c5 Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates 
Add ability to overwrite o3de object when downloading
 2021-11-09 10:41:35 -08:00
brianherrera c182b213ad Remove timeout in the mount step 
We no longer need a timeout here. A timeout mechanism was added to the mount script to raise an exeception if the EBS volume is not mounted in the configured timeframe.

This also causes a bug with the retry mechanism where Jenkins will hit this timeout in the event the node goes offline during the setup stage instead of raising an exception.

Signed-off-by: brianherrera <briher@amazon.com>
 2021-11-09 10:02:11 -08:00
Chris Burel 33d5109fe8 Merge stabilization/2110 as of 20edb35cdc into development (#5319) 2021-11-08 15:22:17 -08:00