Commit Graph

23 Commits

Author SHA1 Message Date
Esteban Papp ec78c1c003 Removes unity=true since its the default
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-22 15:31:46 -07:00
scspaldi d11dbd3732 Updated Linux and Mac configs to show test results.
Signed-off-by: scspaldi <scspaldi@amazon.com>
2021-09-21 11:50:04 -07: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
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
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
Esteban Papp acce801b41 SPEC-7435 Vegetation Tests Reference Missing File: Mocks/MockSpawnableEntitiesInterface.h 2021-06-25 09:23:27 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Esteban Papp 78b8daa783 LYN-4745 ci_build_metrics doesnt distinguish between different repo (#1496)
* add repository to ci_build_metrics

* fixing build

* changing the job to pass the right parameters

* passing parameters that need to be expanded

* missed this, important

* fixing typo
2021-06-23 08:01:39 -07:00
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
Eric Phister 0c7605c9b6 Update minimum required CMake version to 3.20 (#1253)
* Update the minimum CMake version to 3.20

Sets the cmake_minimum_required calls to version 3.20 and updates the
README.md to point at the general CMake download page instead of a stale
link.

* Remove unnecessary cmake minimum version

It was using an old 3.0 version and can be removed.

* Additional updates to CMake 3.20, build scripts

Updates the version and remove logic to find a CMake in 3rdParty.

* Removing backup path to ninja path in the build_ninja_windows.cmd

The backup path for finding ninja was coming from the Perforce depot which isn't available for o3de builds.

* Removing reference to 3rdParty Android SDK 29 from the build and run unit test script

The Android SDK is not part of the new 3rdParty system and users are expected to install the Android SDK on their own in order to build the engine for Android.

* Update the get_python scripts and README

No longer try to append a CMake path to LY_3RDPARTY_PATH, but do still
support LY_CMAKE_PATH because there are still uses of it.  Remove
mention of an LY_3RDPARTY_PATH-relative CMake path from the README.md.

* Removing LY_NINJA_PATH from the build_ninja_windows.cmd

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-11 12:00:55 -05:00
Mike Chang 01847ef6dd Changed mac and ios node label
This changes the Mac and iOS job AMI that we're using to Big Sur (OSX 11.4 update). This includes the following based on https://github.com/aws-lumberyard/o3de/tree/development/scripts/build/build_node/Platform/Mac:

- XCode 12.4
- CMake 3.20.3

Note: As of 86136dd, these builds still fail with the same errors as the nightly build under Catalina. See SPEC-7273 and LYN-4071 for details
2021-06-10 17:24:14 -07:00
Esteban Papp b1fca488bf LYN-4332 Metric jobs not passing JOB_NAME, BUILD_NUMBER, NODE_NAME, CHANGE_ID (#1190)
* Fix quotes

* Revert "Fix quotes"

This reverts commit 29ace5ef2bf1c78991a8cfeb840bfb30c4ce5d8d.

* evaluating the parameters

* Revert "Revert "Fix quotes""

This reverts commit 4f7008e9ccbd5fdc0b33853a4fb1f50285233da9.

* just one eval

* double escaping

* another attempt to happiness

* changing NODE_NAME to LABEL_NAME since that one is more stable and doesnt have spaces
2021-06-08 14:24:22 -07:00
Esteban Papp 1396110f6d Preventing builds from cleaning on each step (#1151) 2021-06-04 15:46:19 -07:00
Esteban Papp 29ac17a090 SPEC-7135 Provide a method to re-trigger compiler detection for changes that require it (#1092)
* SPEC-7135 Provide a method to re-trigger compiler detection for changes that require it

* removing check (is wrong and is not necessary)

* Invert existance check

* add empty lines at the end

* Clean is triggering on each build

* clearing if the variable is false

* test code to understand what is going on...

* yeap, looks good

* handling "false" in linux/mac

* fix for linux/mac

* Fixing typos
2021-06-03 18:05:05 -07:00
Mike Chang 262c1c1132 Change node label for Mac/iOS for new AMI update (#1086)
Changes the default node label for Mac/iOS to the newest AMI

- This AMI contains updates for XCode and CMake
- CMake is now on 3.20.2
2021-06-01 19:14:13 -07:00
pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
Terry Michaels 9b1be43367 Renamed osx_gl to mac and es3 to android for cache folders (#949) 2021-05-26 19:17:17 -05:00
lumberyard-employee-dm 470fde461f Removed engine registration from the Jenkins build scripts which builds the Engine in an engine centric manner 2021-05-21 02:04:07 -05:00
Colin Byrne 43b474a4b2 O3de updates restricted download (#229)
* fix project centric set current
* Adding newline to project.json template
* Adding newline to engine.json
* Changed register -this-engine to be data driven
* adding build server support
* fix log dir
* fix add remove
* fix template creation for restricted
* fix typos and descriptions
* Add newline to the end of template.json
* Adding newline to the end of assets_scan_folders.seteg
* current_project in global project that creates/edits the .o3de/Registry/bootstrap.setreg
* fix the build server flags
* fix the o3de manifest server portion
* disable project manager tests for now. Its changed too much and lytestools is not working at the moment. I will get back to this later.
* fix the Mac build config
* disable project_test, this is the project manager. It has changed too much for these tests to work at the moment. I'll get back to them

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-05-10 12:03:36 -07:00
Shirang Jia 1162177d61 Create a seprate nightly pipeline to always run clean build. (#649) 2021-05-08 11:32:32 -07:00
Esteban Papp 71c315b2b7 SPEC-6510 Illegal instruction in asset_mac.sh on clean asset builds (#349) 2021-04-27 11:38:10 -07:00
Esteban Papp 4a3d24f189 SPEC-6276 Move ci_build and ci_build_metrics to scripts\build 2021-04-14 14:40:42 -07:00