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

497 Commits

Author SHA1 Message Date
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
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
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
AMZN-Phil e5a73fe8ff Add helper function for UI to return paths to all cached gem jsons for a given repo 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-18 16:32:42 -07:00
AMZN-Phil 6f86f0ea5c Merge pull request #4736 from aws-lumberyard-dev/CLIDownloadGems 
Additional fixes for downloading O3DE objects
 2021-10-18 10:26:59 -07:00
AMZN-nggieber 4899309b6a Connect Adding and Removal of Gem Repo UI to CLI (#4729) 
* Connect Adding and Removal of Gem Repo UI to CLI

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

* Addressed PR feedback

Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-18 09:40:34 -07:00
AMZN-Phil 08643f8232 Use a more generic project name in download.py dest-path help 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-17 15:58:41 -07:00
AMZN-Phil 1d220c3eaa Updates based on feedback, flip return value of a function to return a more expected value whether validation passes 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-17 15:50:13 -07:00
AMZN-Phil 6efeaa405d Additional fixes for downloading O3DE objects, and using the cache folder 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-15 13:54:53 -07:00
brianherrera b792ff3d33 Fix command formatting 
Signed-off-by: brianherrera <briher@amazon.com>
 2021-10-13 14:12:18 -07:00
brianherrera 4625e6d315 Fix indentation 
Signed-off-by: brianherrera <briher@amazon.com>
 2021-10-13 13:35:44 -07:00
brianherrera 3c7357da47 Update existing unmount step to use new offline function 
Signed-off-by: brianherrera <briher@amazon.com>
 2021-10-13 10:37:14 -07:00
brianherrera ac8201a2fa Update disk setup step to use context manager 
Signed-off-by: brianherrera <briher@amazon.com>
 2021-10-13 10:34:03 -07:00
brianherrera 56f0ea68a6 Add step to verify disk is in an offline state 
Some Windows configs will automatically set new drives as online causing diskpart setup script to fail.

Signed-off-by: brianherrera <briher@amazon.com>
 2021-10-13 10:29:53 -07:00
AMZN-Phil c355c162ab Merge pull request #4486 from aws-lumberyard-dev/Prism/ShowRepoList 
repo.jsons can be listed and and access through CLI and is Integrated with Project Manager
 2021-10-12 12:38:49 -07:00
nggieber 56de6064d2 Hopefully final pass on PR comments 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-11 12:07:04 -07:00
Junbo Liang c759bc9cd0 Update the Jenkins script to disable access log during AWSI deployment (#4579) 
Signed-off-by: Junbo Liang <junbo@amazon.com>
 2021-10-11 10:52:00 -07:00
nggieber 3698c3c3a7 Merge branch 'development' into Prism/ShowRepoList 2021-10-11 09:20:06 -07:00
nggieber 70053f055a More python PR feedback 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-08 16:52:58 -07:00
Brian Herrera 0d576004fe Merge pull request #4577 from aws-lumberyard-dev/pipelines/add-retry-inc-build-util 
Add retry config to boto3 clients
 2021-10-08 14:27:43 -07:00
Junbo Liang a5cd1b55e4 Make the access log bucket optional in the AWSCore CDK application (#4553) 
* Make the access log bucket optional in the AWSCore CDK application

Signed-off-by: Junbo Liang <junbo@amazon.com>
 2021-10-08 10:37:50 -07:00
brianherrera e256df3f05 Add retry config to boto3 clients 
This change makes the inc_build_util script more resilient against transient network issues and issues encountered during node boot-up.

Signed-off-by: brianherrera <briher@amazon.com>
 2021-10-08 10:05:50 -07:00