birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,270 Commits 3 Branches 3 Tags
5bb8a17d795bc775ee2080b24d2437df039cc0ea
Commit Graph

24 Commits

Author SHA1 Message Date
Terry Michaels d9ec159f0e Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de 
Gitflow 7/16/21 - O3DE
 2021-07-16 17:50:44 -05:00
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>
 2021-07-16 15:25:48 -07:00
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
 2021-07-16 13:21:55 -07:00
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>
 2021-07-12 16:58:33 -07:00
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-08 13:56:47 -05:00
Shirang Jia 55a3b41222 Fix unmounting error (#1940) 2021-07-07 16:44:42 -07:00
Shirang Jia 992f5aab1b Convert Incremental scripts to Python3 (#1934) 
Convert incremental build script to Python3
 2021-07-07 15:12:10 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 12:42:44 -05:00
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>
 2021-06-30 19:51:55 -07:00
Brian Herrera 1b3eb1d44d Merge pull request #1689 from aws-lumberyard-dev/pipelines/SPEC-7574 
Add parameter so created EBS volumes are encrypted
 2021-06-30 16:45:31 -07:00
brianherrera 0b75ebcdd8 Add parameter so created volumes are encrypted. 
Signed-off-by: brianherrera <briher@amazon.com>
 2021-06-30 11:12:57 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
John c831304c8a Address PR comments 2021-06-24 19:31:53 +01:00
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.
 2021-06-24 18:39:03 +01:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
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
 2021-06-22 10:35:02 -07:00
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
 2021-04-28 12:11:15 -07:00
shiranj 23b9b3e12b Fix indentation 2021-04-19 15:52:43 -07:00
shiranj f5b7200f32 Fix typo 2021-04-19 14:59:43 -07:00
shiranj a6cea546da Add repository name to EBS volume tag 2021-04-19 14:52:37 -07:00
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.
 2021-04-08 17:36:00 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
Brian Herrera e8bbb5a0d5 Set scripts to be executable 
This is required to build on linux/mac
 2021-03-26 09:26:12 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00