5e08ec2fa8
Merge branch 'github/staging' of https://github.com/aws-lumberyard-dev/o3de into github/staging
2021-04-13 09:09:00 -07:00
fba71c0ca4
Removing epb_sanity_smoke_no_gpu_test
2021-04-13 09:08:01 -07:00
73e5a3693f
Fixing missing execute permissions
2021-04-12 11:03:50 -07:00
cd12226849
Merge branch 'main' into github/staging
2021-04-12 08:48:09 -07:00
b8e508c2ee
Cherrypicking MeshCompiler fix
2021-04-12 08:45:38 -07:00
aa0b54838c
Fix PhysXDebug and PhysXEditor loading order ( #14 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com >
2021-04-12 14:16:01 +01:00
a92da4bcf5
Merge pull request #13 from aws-lumberyard-dev/scale-gizmo-uniform
...
making scale gizmo apply uniform scale to transform
2021-04-12 10:13:35 +01:00
b444c68fd3
Merge branch 'main' into scale-gizmo-uniform
2021-04-10 16:13:44 +01:00
51f1183ff4
making scale gizmo apply uniform scale to transform
2021-04-10 15:58:42 +01:00
038540c922
Merge pull request #9 from aws-lumberyard-release/remove_packaging_scrubbing_validation
...
Remove scrubbing/validation from packaging script
2021-04-09 18:18:36 -07:00
7c5e555a40
Fix indentation in Jenkinsfile
2021-04-09 18:14:14 -07:00
82a73c7ece
Merge branch 'main' into remove_packaging_scrubbing_validation
2021-04-09 17:56:06 -07:00
54233f5838
Merge branch 'github/staging' of https://github.com/aws-lumberyard-release/o3de into github/staging
2021-04-09 17:37:46 -07:00
71bd6c67b8
Removed external projects from build_config
2021-04-09 17:36:59 -07:00
f7651a6d0f
Cleaning up Jenkinsfile ( #8 )
...
SPEC-6241 GitHub cleanup of Jenkinsfile
2021-04-09 17:25:49 -07:00
3dc9ae7c0f
Merge branch 'main' into remove_packaging_scrubbing_validation
2021-04-09 15:48:44 -07:00
9f42a8f9bd
Remove scrubbing/validation from packaging script
2021-04-09 15:46:41 -07:00
674b9d6fdf
Remove scrubbing. It cannot run in the o3de repo.
2021-04-09 14:52:20 -07:00
ae04211f8c
Merge branch 'main' into github/staging
2021-04-09 14:42:18 -07:00
6f836e4614
Re-add change removed in latest merge.
2021-04-09 14:40:18 -07:00
e8f6463db0
SPEC-3580 Move Jenkins pipeline files to another folder ( #4 )
2021-04-09 12:17:34 -07:00
8caec43f2a
Updating 3rdparty link in README to rev12
2021-04-09 12:04:41 -07:00
c5b955d281
Integrating github/staging through commit b0dd7ed
2021-04-09 12:03:26 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
302c0aef80
Merge pull request #2 from aws-lumberyard-release/test_metrics_param_removal
...
Removing unused arg for test metrics
2021-04-09 11:06:46 -07:00
69fdd42d59
Set default repo to o3de
...
Using env prevents setting different repos in a single instance. This will need to be set in another way.
2021-04-09 08:30:29 -07:00
0d6a0f4836
Merge branch 'main' into test_metrics_param_removal
2021-04-08 20:47:36 -07:00
733899636c
Merge branch 'main' into test_metrics_param_removal
2021-04-08 20:44:15 -07:00
ae62a97894
Merge pull request #3 from aws-lumberyard-release/build/multi-repo-support
...
Use complete Jenkins project name when creating EBS volumes
2021-04-08 19:35:34 -07:00
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
b32aa9beda
Merge pull request #1 from aws-lumberyard-release/update-lfs-config
...
Updating lfs endpoint
2021-04-08 16:51:11 -07:00
43d39096eb
Removing unused arg for test metrics
2021-04-08 15:13:39 -07:00
4caeb3ffe4
Updating lfs endpoint
2021-04-08 10:45:16 -07:00
afc51ab0d3
Merge pull request #19 from aws-lumberyard-test/metrics_setup
...
Adding MARS test metrics
2021-04-07 20:27:53 -07:00
041714c614
Merge branch 'main' into metrics_setup
2021-04-07 18:24:54 -07:00
4016d6da2f
Merge pull request #20 from AMZN-alexpete/github/staging
...
* Integrating up through commit 90f050496
* Updating 3rdParty link in README
Co-authored-by: Brian Herrera <briher@amazon.com >
2021-04-07 17:59:29 -07:00
4eae31c376
Remove git prune step
2021-04-07 16:51:02 -07:00
91ae6d2771
Remove scrubbing job from the pipeline
...
This will need to be ran in its own pipeline
2021-04-07 15:19:09 -07:00
20828a0bf4
Add credential id to the checkout step for the mars repo
2021-04-07 14:49:22 -07:00
edc77e3366
Fixing syntax error
2021-04-07 14:43:14 -07:00
004db04c06
Restoring LFS functionality lost in merge
2021-04-07 14:37:21 -07:00
ae652cc62a
Updating 3rdParty link in README
2021-04-07 14:06:18 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
5d586cbf64
Adding build step to build job name for test metrics
2021-04-06 16:21:15 -07:00
2d13bfda9d
Adding build job name to jenkinsfile for test metrics
2021-04-06 14:55:08 -07:00
e6491ba1aa
Adding MARS test metrics
2021-04-05 14:36:52 -07:00
8f2ed080a9
Merge pull request #15 from oyongzhi/project_path_fix
...
Project path fix - Changed sys_game_folder to project_path in bootstrap.cfg.
2021-04-01 17:35:24 +01:00
197973cc2d
Merge branch 'main' into project_path_fix
2021-04-01 17:27:49 +01:00
5df75c052f
Merge pull request #16 from oyongzhi/FlakyAssetBatch2Main
...
Flaky asset batch2 main
2021-04-01 09:17:15 -07:00
7dfc79faa0
Move Batch_2_main test block back to main from sandbox. Move single FastScaneWorks_FasterThanFullScan test to sandbox.
2021-04-01 15:49:11 +01:00
alexpete
Alex Peterson
Ulugbek Adilbekov
greerdv
greerdv
Shirang Jia
Esteban Papp
Brian Herrera
evanchia-ly-sdets
evanchia
oyongzhi
oyongzhi