birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,750 Commits 3 Branches 3 Tags
fc3d2ce94cdca041d3aa896dfd487dc3480fea7e
Commit Graph

520 Commits

Author SHA1 Message Date
Mike Chang 46f4935ee4 Update to licenses/notices script (#5214) 
This updates the licenses script to pull in all PackageInfo.json files with a specific argument, then follows each license file defined and writes the contents to a file. In this mode, if a packageinfo file is found, it will only grab the license file path defined within.

Also has the following features:

* Generalizes the function and variable names for non-license specific references
* Sorts os.walk to maintain consistent ordering
* Uses an ordered dict for the output, also to maintain ordering if using Python below 3.7
* Adds an additional json config file to have specific exclusion rules for 3p packages
* Adds a package creation function and config file entry
* Allow multipath scans, optional use of gitignore, merged license file scan

Signed-off-by: Mike Chang <changml@amazon.com>
 2021-11-05 14:04:05 -07:00
Esteban Papp eecf6ab920 Create a nightly job that validates project-centric/engine-prebuilt (#5287) 
* adds a test_install_profile_vs2019_pipe job to validate a project can build from the SDK

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

* missed escaping these variables and breaks runtime dependencines in the install layout

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

* Changes to PIPELINE_ENV_OVERRIDE

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

* Tries to propagate ENV variables from pipeline jobs to jobs under it

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

* Fixes typo

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

* echoing a var to understand why is not going to the right path

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

* put the COMMAND_CWD in the wrong job

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

* adding similar jobs for linux/mac

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

* dont pass an empty LY_PROJECTS

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

* cmd -> sh, copy-paste mistake

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

* inverting check in linux/mac

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

* more fixes for linux/mac

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

* fixing script paths for macos

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

* more fixes for linux/mac

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

* Test use of %% instead of !! for windows builds

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

* fixes typo

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-05 12:30:19 -07:00
Shirang Jia 08115fc41f Add platform name to AP log path on S3 (#5316) 
* Add platform name to AP log path on S3

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

* Add platform name to AP log path on S3

Signed-off-by: shiranj <shiranj@amazon.com>
 2021-11-05 10:36:14 -07:00
Shirang Jia d584732116 Fix ap log path on s3 (#5257) 
* Fix typo when calling upload_to_s3.py

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

* Remove space in extra_args

Signed-off-by: shiranj <shiranj@amazon.com>
 2021-11-03 10:45:12 -07:00
Mike Balfour 6d7be70133 Merge pull request #5202 from aws-lumberyard-dev/mbalfour/gitflow_211102_o3de 
Merging stabilization/2110 to development
 2021-11-02 13:33:14 -05:00
lumberyard-employee-dm 6a6d8e6b39 Fixed unit_test_regiser.py test on Linux/Mac (#5031) 
Added pathlib.Path.resolve() calls to make sure the compared paths were both absolute

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-02 10:57:31 -05:00
Mike Balfour 508748f39c Merge commit '8aecd6668ae21db3cb80e0063db9d0b37b44f802' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:48 -05:00
Esteban Papp edf5e7a242 Cleanup of validation script exclusions (#5134) 
* Validation lists cleanup

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

* more cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-01 11:06:37 -07:00
Brian Herrera fa83a1fff8 Merge pull request #5146 from aws-lumberyard-dev/devops/update-snapshots 
Update snapshots list to stablization/2110
 2021-11-01 09:59:51 -07:00
Shirang Jia 1ec34f6123 Fix typo when calling upload_to_s3.py (#5139) 
Signed-off-by: shiranj <shiranj@amazon.com>
 2021-10-29 21:11:53 -07:00
Mike Chang 22820b6a90 Update snapshots list to stablization/2110 
Signed-off-by: Mike Chang <changml@amazon.com>
 2021-10-29 15:13:20 -07:00
Esteban Papp 475338cfad Merge branch 'development' into o3de_sdk/installer_configs 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-28 18:29:52 -07:00
Esteban Papp 4dcd60ba08 testing changes to fix Jenkins 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-28 17:49:31 -07:00
Esteban Papp ecf70daca8 does this space affects? 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-28 17:44:16 -07:00
AMZN-Phil d355942e8b Fix an additional location 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-28 16:36:54 -07:00
AMZN-Phil 5971f1176e Fix thrown exceptions if repos does not exist in the manifest 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-28 16:17:28 -07:00
Shirang Jia b8ced0d461 Fix AP log path on S3 (#5068) 
Signed-off-by: shiranj <shiranj@amazon.com>
 2021-10-28 13:31:33 -07:00
Danilo Aimini 391da332eb Merge commit '767466c57b8e0e3e24d7522e8d8adba4027da04d' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:21:51 -07:00
Shirang Jia 7ab0871327 Upload AP logs when there is an AP eeror (#4896) 
* Updating LFS config to new endpoint (#1624)

Signed-off-by: AMZN-alexpete

* Updates licenses to APACHE-2.0 OR MIT (#1685)

Not to be committed before 7/6/2021

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>

* Updating CONTRIBUTING.md

Signed-off-by: Terry Michaels <miterenc@amazon.com>

* Fixed typo

Signed-off-by: Terry Michaels <miterenc@amazon.com>

* Updated text to be more descriptive

Signed-off-by: Terry Michaels <miterenc@amazon.com>

* Upload AP logs when there is an AP eeror

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

* Add AP log upload step for single step Asset jobs

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

* Address more comments

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

* Only call CreateUploadAPLogsStage() once in try/catch block

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

* Revert acciental update to README.md

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

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Co-authored-by: Chris Galvan <chgalvan@amazon.com>
Co-authored-by: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com>
Co-authored-by: Terry Michaels <miterenc@amazon.com>
 2021-10-25 19:16:29 -07:00
AMZN-Phil bec24a85bf Fix old references to gem_list 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-25 15:59:30 -07:00
Mike Chang 62231aeb4c Add xcb input dev packages (#4962) 
Signed-off-by: Mike Chang <changml@amazon.com>
 2021-10-25 13:48:17 -07:00
Esteban Papp fec1b2fda2 Merge branch 'development' into o3de_sdk/installer_configs 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
#	cmake/Platform/Common/Install_common.cmake
 2021-10-25 12:47:36 -07:00
nggieber 182a7b98b7 Always convert gem_path to pathlib.Path and check it isFile() in case it is a str 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 17:33:30 -07:00
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 17:28:28 -07:00
AMZN-Phil e8a7743aec Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos 
Gem Repos can be Refreshed through Project Manager
 2021-10-22 17:23:35 -07:00
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 17:19:54 -07:00
nggieber 78e556e5ff Changed gem_list to gem_set 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 16:36:34 -07:00
nggieber 500ac030a3 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 16:30:02 -07:00
nggieber 673815c58d Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 16:23:17 -07:00
nggieber 15f4c1a091 Undownloaded remote gems are shown in Gem Catalog and searchable by repo name 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 16:22:16 -07:00
AMZN-Phil 69771ab2e1 Merge pull request #4892 from aws-lumberyard-dev/TrackDownloadProgress 
Project Manager track progress of, and cancel downloads
 2021-10-22 15:53:29 -07:00
Esteban Papp ec78c1c003 Removes unity=true since its the default 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-22 15:31:46 -07:00
AMZN-Phil e1b46b7e5c Add comment about additional callback function and be explicit on return value. 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-22 14:23:55 -07:00
AMZN-Phil b609dbbbbb Pass a callback instead of weak linking a module 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-22 14:07:32 -07:00
nggieber f6d4556b60 Merge branch 'development' into Prism/RefreshGemRepos 2021-10-22 12:41:09 -07:00
Alex Peterson b536abbf4e Add existing gem through Project Manager 2021-10-22 10:53:29 -07:00
nggieber 968c8640d0 Merge branch 'development' into Prism/RefreshGemRepos 2021-10-22 07:44:37 -07:00
nggieber b4a85a2ed6 Repos can be refreshed through Project Manager individually or all at once 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 07:38:41 -07:00
evanchia 26fdd5a553 adding the --no-tests=error ctest arg to linux and windows test jobs 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-10-21 16:13:20 -07:00
AMZN-Phil e3cfcd4cc7 Add the ability for Python to pass download progress to Project Manager and to cancel downloads. 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-21 16:07:07 -07:00
AMZN-Phil 89c7ab2405 Merge pull request #4849 from aws-lumberyard-dev/AddLocalRepoFix 
Fix adding local repos
 2021-10-21 13:50:11 -07:00
AMZN-Phil bc9f6be4cf Change repo_uri passed into register repo to always be a str 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-21 10:11:18 -07:00
lumberyard-employee-dm 7a14a21377 Fixed create-project/create-gem to use relative paths directly (#4811) 
* Fixed create-project/create-gem to use relative paths directly

It was previously making relative paths, relative to the default_projects_folder and default_gems_folders

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

* Removed uppercase of "Templates" param in get_registered call.

That method looks up the restricted template directory location based on the lowercase key of "templates"
Updated argparse doc to fix typos or clarify which directories a path is relative to.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-10-21 10:59:42 -05:00
AMZN-Phil 961c412179 Fix adding local repos due to JSON not being able to serialize Windows paths 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-20 16:39:11 -07:00
AMZN-Phil fdce8a3085 Merge pull request #4773 from aws-lumberyard-dev/ReturnCachedGemJsons 
Helper function to return cached gem json paths
 2021-10-20 12:44:39 -07:00
Alex Peterson 1c409e0a23 Change default folders for user content (#4333) 
old vs. new defaults:
%USERHOME%/.o3de/Projects-> %USERHOME%/O3DE/Projects
%USERHOME%/.o3de/Gems-> %USERHOME%/O3DE/Gems
%USERHOME%/.o3de/Templates-> %USERHOME%/O3DE/Templates


Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-20 11:18:27 -07:00
AMZN-Phil e8cd6add51 Merge remote-tracking branch 'upstream/development' into ReturnCachedGemJsons 2021-10-20 10:00:39 -07:00
Mike Chang 8ab1cfacf5 Fixes for Test Screenshot upload build step (#4792) 
Fixes the test screenshot upload build step:

- Added missing positional parameters
- Double quoting the command statements to allow variable expansion (also fixes broken Python call)
- Escaping the double quotes within the command statement

Signed-off-by: Mike Chang <changml@amazon.com>
 2021-10-19 14:06:03 -07:00
AMZN-Phil 7ce376b5b2 Add some log output if the cached files cannot be found 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-19 08:40:36 -07:00
AMZN-Phil c48d957485 Slightly better variable naming 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-18 16:34:07 -07:00