Commit Graph

517 Commits (b82ea09a67bec33a19e657d60b834da8e4dcb25c)

Author SHA1 Message Date
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>
4 years ago
Mike Balfour 6d7be70133
Merge pull request #5202 from aws-lumberyard-dev/mbalfour/gitflow_211102_o3de
Merging stabilization/2110 to development
4 years ago
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>
4 years ago
Mike Balfour 508748f39c Merge commit '8aecd6668ae21db3cb80e0063db9d0b37b44f802' into mbalfour/gitflow_211102_o3de 4 years ago
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>
4 years ago
Brian Herrera fa83a1fff8
Merge pull request #5146 from aws-lumberyard-dev/devops/update-snapshots
Update snapshots list to stablization/2110
4 years ago
Shirang Jia 1ec34f6123
Fix typo when calling upload_to_s3.py (#5139)
Signed-off-by: shiranj <shiranj@amazon.com>
4 years ago
Mike Chang 22820b6a90 Update snapshots list to stablization/2110
Signed-off-by: Mike Chang <changml@amazon.com>
4 years ago
Esteban Papp 475338cfad Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 4dcd60ba08 testing changes to fix Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp ecf70daca8 does this space affects?
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-Phil d355942e8b Fix an additional location
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil 5971f1176e Fix thrown exceptions if repos does not exist in the manifest
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Shirang Jia b8ced0d461
Fix AP log path on S3 (#5068)
Signed-off-by: shiranj <shiranj@amazon.com>
4 years ago
Danilo Aimini 391da332eb Merge commit '767466c57b8e0e3e24d7522e8d8adba4027da04d' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
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>
4 years ago
AMZN-Phil bec24a85bf Fix old references to gem_list
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Mike Chang 62231aeb4c
Add xcb input dev packages (#4962)
Signed-off-by: Mike Chang <changml@amazon.com>
4 years ago
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
4 years ago
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>
4 years ago
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 4 years ago
AMZN-Phil e8a7743aec
Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos
Gem Repos can be Refreshed through Project Manager
4 years ago
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
nggieber 78e556e5ff Changed gem_list to gem_set
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
nggieber 500ac030a3 Merge branch 'development' into Prism/ShowRepoGems 4 years ago
nggieber 673815c58d Merge branch 'development' into Prism/ShowRepoGems 4 years ago
nggieber 15f4c1a091 Undownloaded remote gems are shown in Gem Catalog and searchable by repo name
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
AMZN-Phil 69771ab2e1
Merge pull request #4892 from aws-lumberyard-dev/TrackDownloadProgress
Project Manager track progress of, and cancel downloads
4 years ago
Esteban Papp ec78c1c003 Removes unity=true since its the default
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-Phil e1b46b7e5c Add comment about additional callback function and be explicit on return value.
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil b609dbbbbb Pass a callback instead of weak linking a module
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
nggieber f6d4556b60 Merge branch 'development' into Prism/RefreshGemRepos 4 years ago
Alex Peterson b536abbf4e
Add existing gem through Project Manager 4 years ago
nggieber 968c8640d0 Merge branch 'development' into Prism/RefreshGemRepos 4 years ago
nggieber b4a85a2ed6 Repos can be refreshed through Project Manager individually or all at once
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
evanchia 26fdd5a553 adding the --no-tests=error ctest arg to linux and windows test jobs
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
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>
4 years ago
AMZN-Phil 89c7ab2405
Merge pull request #4849 from aws-lumberyard-dev/AddLocalRepoFix
Fix adding local repos
4 years ago
AMZN-Phil bc9f6be4cf Change repo_uri passed into register repo to always be a str
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
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>
4 years ago
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>
4 years ago
AMZN-Phil fdce8a3085
Merge pull request #4773 from aws-lumberyard-dev/ReturnCachedGemJsons
Helper function to return cached gem json paths
4 years ago
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>
4 years ago
AMZN-Phil e8cd6add51 Merge remote-tracking branch 'upstream/development' into ReturnCachedGemJsons 4 years ago
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>
4 years ago
AMZN-Phil 7ce376b5b2 Add some log output if the cached files cannot be found
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil c48d957485 Slightly better variable naming
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
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>
4 years ago
Esteban Papp 5df85534b7 Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	cmake/Packaging.cmake
#	cmake/Projects.cmake
#	scripts/build/Platform/Windows/build_config.json
4 years ago
AMZN-Phil 6f86f0ea5c
Merge pull request #4736 from aws-lumberyard-dev/CLIDownloadGems
Additional fixes for downloading O3DE objects
4 years ago