Commit Graph

363 Commits (70a8214c2dba9ee65d29e8f91810b1fbc2bc7903)

Author SHA1 Message Date
Terry Michaels d9ec159f0e
Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
Gitflow 7/16/21 - O3DE
4 years ago
Steve Pham 38261d0800
Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
4 years ago
Shirang Jia 23f690cd55
Cleanup incremental build scripts (#2004)
* Cleanup incremental build scripts

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

* Fix timeout function since signal.SIGALRM is not available on Windows

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

* Convert missing fstrings

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

* Add PipelineAndBranch back to EBS volume tag

Signed-off-by: shiranj <shiranj@amazon.com>
5 years ago
Chris Galvan f278bbcd65
Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712
Merged stabilization/2106 to development
5 years ago
brianherrera 41e864de95
Remove separate git lfs steps.
The steps to remove git lfs hooks and inject creds are no longer required with the public repo.

Signed-off-by: brianherrera <briher@amazon.com>
5 years ago
brianherrera 1121bf6e60
Remove separate git lfs steps.
The steps to remove git lfs hooks and inject creds are no longer required with the public repo.

Signed-off-by: brianherrera <briher@amazon.com>
5 years ago
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Steve Pham b8f857a270
Ubuntu package updates (#1985)
Add required libfontconfig1-dev which is needed by Linux/Qt/QtFontDatabaseSupport (dependency of Qt5XcbQpa)

Signed-off-by: spham-amzn <spham@amazon.com>
5 years ago
lumberyard-employee-dm 6ebf3a93d1
Added protection in the register python script queries of the default folders against a non-existent key causing a KeyError in python (#1946)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
jonawals 54138bb04c
Properly handle creation of TIAF historic workspace directory (#2006)
* Fix historic working dir creation

Signed-off-by: John <jonawals@amazon.com>

* Add new line at EOF

Signed-off-by: John <jonawals@amazon.com>

* Removing extra whitespace at end of file

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

* Log global exception caught by TIAF driver

Signed-off-by: John <jonawals@amazon.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
Terry Michaels 9ea9cbf589
Merge pull request #1989 from aws-lumberyard-dev/cgalvan/gitflow_210708
Merged stabilization/2106 to development
5 years ago
jonawals 06c65be40a
Add handling for integrity failures when applying and resolving change lists (#1993)
* ApplyAndResoveChangeList integration failure policy

Signed-off-by: John <jonawals@amazon.com>

* Default integrity failure policy for TIAF sequences

Signed-off-by: John <jonawals@amazon.com>

* Fix superfluous quotation marks

Signed-off-by: John <jonawals@amazon.com>

* Remove superfluous args parse

Signed-off-by: John <jonawals@amazon.com>

* Fix broken storage of last commit hash

Signed-off-by: John <jonawals@amazon.com>
5 years ago
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts).
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Shirang Jia 55a3b41222
Fix unmounting error (#1940) 5 years ago
Shirang Jia 992f5aab1b
Convert Incremental scripts to Python3 (#1934)
Convert incremental build script to Python3
5 years ago
hultonha 40726a32dc
Merge pull request #1898 from aws-lumberyard-dev/hultonha/gitflow_210706_o3de
stabilization2106 -> development merge (210706)
5 years ago
jonawals a3d14e217e
Change TIAF seed criteria. (#1857)
We currently cannot predict when a given snapshot will be taken. This is
problematic as test impact analysis assumes that the coverage data will
be updated after each run. As we have no control over when our coverage
data will persist we will instead always seed when the pipeline and
branch is one of the seeding pipelines, otherwise we will attempt to
read that seed data and perform test impact analysis (if no seed data is
present we will fall back to a regular, uninstrumented run of all test
targets).

This approach has the following implications:

1. PR builds will benefit from test impact analysis as the seed data is
    (hopefully) available at the time the snapshot is created.

2. Builds for the aforementioned seeding branches and pipelines will not
    benefit from test impact analysis and will incur the cost of seeding
    regardless of whether or not that generated seed data ends up in the
    snapshot.

Signed-off-by: John <jonawals@amazon.com>
5 years ago
hultonha dee65914f0 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha/gitflow_210706 5 years ago
lumberyard-employee-dm 8592e4fbbe
Added if checks in the get_project* and get_engine* function to protect against None being returned from get_project_json_data and get_engine_json_data respectively (#1880)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
John 17fde4e228 Move source of truth logic from TIAF to job 5 years ago
lumberyard-employee-dm d73a98aa2f
Added detection of gems which are not directly under an external subdirectory root (#1841)
* Added proper detection of the list of Gems in the Project Templates
enabled_gems.cmake file

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

* Added a CMake alias target for the Atom Gem and the AtomLyIntegration

Both of those targets just aliases the Atom_AtomBridge gem
Therefore they turn on Atom

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

* Replacing the Atom_AtomBridge gem in the project template with the Atom gem

The Atom gem is just an alias to the Atom_AtomBridge gem

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

* Updated the manifest.py gem gathering logic to recurse through the external subdirecotories locating gem.json files to discover all gems in a subdirectory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
Chris Galvan b9e06e70d9 Fixed copyright header issues per new validator
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
AMZN-Phil b3fd63a0f3
Merge branch 'stabilization/2106' into LYN-4507 5 years ago
lumberyard-employee-dm 2478c60793
Fixed several o3de python package and install layout issues (#1714)
* Updated the CrashLog directory path to save to the project user
directory instead of the engine-root directory

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

* Removing the custom OUTPUT_NAME for the Multiplayer Gem Builder target

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

* Changed the default value for the LY_3RDPARTY_PATH cache variable to be
~/.o3de/3rdParty

This simplifies the first time user experience when running cmake

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

* Fixed Windows only issue where using creating a VS Solution for an O3DE project on a different drive resulted in an unloaded "<drive letter>:" entry appearing in the solution explorer

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

* Refactored install layout logic for External Subdirectories

Instead of performing a regular expression over the Gems/* directory, now the each external subdirectory including the project (external) directory is recursied over and scanned for any folders that aren't excluded.
By default those folders are the [Cc]ache, [Bb]uild and [Uu]ser directories

Afterwards the list files to copy over are then split into a directory list and a file list that is filtered by an include regex
Next the directory list is iterated over and the directories are copied to the install layout
Finally the file list is iterated and the list of files are also copied to the install layout

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

* Fixed the o3de.bat script changing the working directory before running the o3de.py script

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

* Fixed exception in engine-template.py script when the create-gem command
is invoked with the --template-name parameter that does not correspond
to a registered Template

Updated the create-project command to register the project with the
o3de_manifest.json and the engine with the project as the final step

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

* Fixed register.py over-registration of non-engine directories when then
--this-engine parameter is supplied.
All the projects, gems and templates inside of the default o3de_manifest
folder locations were being registered with the engine that was being
registered

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

* Fixed register.py register_project_path() method to return 0 when the
project path is successfully registered.

This issue was that the save_o3de_manifest method "return" value was
being checked and that method doesn't actually return a value

Added question mark to the engine_template.py to correct text around
notifying the user if the project was registered

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

* Added doc comment on the new cmke ly_get_vs_folder_directory function()

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

* Added clarifying comment to the ly_setup_others() command logic to copy over directories and files from any external subdirectories(Gems) that are registered with the engine at the time of install

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

* Fixed infinite recursion when trying to create a template with the
source directory used to seed the template

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
pconroy a0b754bb4d Fix return value when multiple projects are removed and one fails
Signed-off-by: pconroy <pconroy@amazon.com>
5 years ago
pconroy ae6a424064 Make remove_invalid_o3de_projects take a path and return a value
Signed-off-by: pconroy <pconroy@amazon.com>
5 years ago
pconroy e0c3d15d5a Remove deleted projects from project manager
Signed-off-by: pconroy <pconroy@amazon.com>
5 years ago
Shirang Jia af9f1aaae0
Remove unused package filelist (#1687) 5 years ago
AMZN-ScottR 6af01fc378 Merge branch 'stabilization/2106' into installer/2106-engine-name
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
Steve Pham b4a2edec6a
Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
5 years ago
AMZN-ScottR 56ce9908a5 [installer/2106-engine-name] update installer job to override engine name
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
Brian Herrera 1b3eb1d44d
Merge pull request #1689 from aws-lumberyard-dev/pipelines/SPEC-7574
Add parameter so created EBS volumes are encrypted
5 years ago
brianherrera 0b75ebcdd8
Add parameter so created volumes are encrypted.
Signed-off-by: brianherrera <briher@amazon.com>
5 years ago
Gene Walters dd206caf37 Updating pytest to work with new project_property::edit_project_props parameters
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 9f0bbf3b74
SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634)
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Gene Walters f905b71844 Adding missing o3de copyright headers
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
John ea2115089b Correct tiaf output path to use foward slash dirs
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John 6067ab38c8 Parameterize build dir and make job explicit profile
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John aa94effd26 Fix snapshot choice that was incorrectly added
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John cfe4a49136 Address PR comments
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John 3c31424e92 Address PR comments
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John 992e8500ea Add snapshot selection to PR and non-PR builds.
PR builds will detect the destination branch and check if that branch
is one of the snapshot branches, otherwise it defaults to the 'development'
snapshot.

Non-PR builds use the user-selected snapshot from the list of available
snapshots.

Signed-off-by: John <jonawals@amazon.com>
5 years ago
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
Esteban Papp acce801b41
SPEC-7435 Vegetation Tests Reference Missing File: Mocks/MockSpawnableEntitiesInterface.h 5 years ago
John cfe839e89e Address PR comments 5 years ago