Commit Graph

24 Commits (d9ec159f0e07ff86957e15212232413c4ff4d1dc)

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>
4 years ago
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts).
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 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
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.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
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 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
John c831304c8a Address PR comments 5 years ago
John 38f852d8b9 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.
5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
Esteban Papp 44d8e7b804
LYN-4666 Make AR builds use the stabilization/2106 snapshot (#1440)
* use snapshots out of stabilization

* temporal print to figure out why the mount is not used

* removing print used for debugging
5 years ago
Shirang Jia e0f8066a97
Add AttachDate tag to EBS volume and add script to find/delete inactive EBS volumes (#380)
Add AttachDate tag to EBS volume and add script to find/delete inactive EBS volumes
5 years ago
shiranj 23b9b3e12b Fix indentation 5 years ago
shiranj f5b7200f32 Fix typo 5 years ago
shiranj a6cea546da Add repository name to EBS volume tag 5 years ago
Brian Herrera aef10339d5 Use complete Jenkins project name when creating EBS volumes
This change will allow us to support multiple repos in our account by using the full project name for the volumes. Right now multiple repos running the default pipeline will use the same name (e.g. defaultmain<platform>) and will conflict when similar branch names are used.
5 years ago
alexpete c2cbd430fe Integrating up through commit 90f050496 5 years ago
Brian Herrera e8bbb5a0d5 Set scripts to be executable
This is required to build on linux/mac
5 years ago
alexpete a10351f38d Initial commit 5 years ago