Commit Graph

514 Commits (c73417a9c135e7788d10c1ca57a1a916a2d8c17b)

Author SHA1 Message Date
nggieber 3d21a9f4bd Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
AMZN-Phil c07b666bec Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/AdditionalProgressFixes 4 years ago
nggieber d9443ec42c Addressed some PR feedback and continue filtering with same search string even after refresh
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
nggieber 2913d72d17 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
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>
4 years ago
AMZN-Phil cd2b1fa91c
Merge pull request #5503 from aws-lumberyard-dev/Prism/CLIDelFileFolderFix
Fix trying to remove a cache file
4 years ago
AMZN-Phil f2e191ea77 Fix trying to remove a cache file
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Shirang Jia 576248a870
Merge Jenkinsfile from development to stabilization (#5391)
Signed-off-by: shiranj <shiranj@amazon.com>
4 years ago
AMZN-Phil 0102894a83 Handle servers with no content length and make downloading more obvious
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Brian Herrera 770378959a
Merge pull request #5450 from aws-lumberyard-dev/retry-failure-fix
Remove timeout in the mount step
4 years ago
AMZN-Phil e9c3a453c5
Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates
Add ability to overwrite o3de object when downloading
4 years ago
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>
4 years ago
AMZN-Phil 81515b922f Additional readability
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil 31382d080e Remove duplication, additional readability and added missed file
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil 047c5f2231 Add ability to overwrite o3de object when downloading, and to check the last_updated field to check for updates.
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-nggieber 4721ef8298
License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272)
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
lumberyard-employee-dm 627012840d
Update how Project Filepaths are calculated when not supplied via command line (#5194)
* Fixed the return value of the ConvertToAbsolutePath function

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

* Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)

* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

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

* Removed the platform name from the bootstrap.game.*.setreg

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

* Update how the project related file paths are determined when not
supplied.

The project-path determination now goes back to only detecting a "project.json" file.
It no longer attempts to detect a "Cache" directory

The project-cache-path determination now in addition to checking the
project_cache_path key searches for a "Cache" directory.

The project-path defaults to executable folder if it cannot be detected.

The copying of generated executable folder Registry directory contents
to the product cache is now removed after the archive step.

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

* Updated the invocation of the AssetProcessor in Jenkins to supply an
absolute path to the project.

The project-path is no longer treated as relative to the engine root,
but instead relative to the current working directory at application
startup.

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

* Added constant for the storing the name of Cache directory

Fixed typos and grammatical errors in the SettingsRegistryMergeUtils.cpp

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

* Updated UnitTest prepend the EngineRoot path to "AutomatedTesting" when
setting the project path.

This is needed now that the project-path isn't treated relative to the
EngineRoot if it is not absolute.

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

* Fix AssetSeedManagerTest and PlatformAddressedAssetCatalogManagerTest

Instead of trying to used the AutomatedTesting directory as the project root, the temp directory created during the test is used as the project root.

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

* Moved the setting of the project cache root folder and project
asset platform root folder into the `if (!projectCachePath.empty())`
block

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

* Removing the scan up logic for the "Cache" directory.

This is no longer needed to locate the project cache path in a Project Game Release Layout.

Because the project path defaults to the executable directory if, it is not found, the Cache directory will be set to the "Cache" directory within the executable directory.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Chris Burel d598a7c709
[Linux] Update Jenkins Linux build to use Ubuntu 20, clang 12 (#5035)
Signed-off-by: Chris Burel <burelc@amazon.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
AMZN-Phil bec24a85bf Fix old references to gem_list
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
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
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
AMZN-Phil 6f86f0ea5c
Merge pull request #4736 from aws-lumberyard-dev/CLIDownloadGems
Additional fixes for downloading O3DE objects
4 years ago