Commit Graph

74 Commits

Author SHA1 Message Date
scottr 7b1ac7dd4e Merge branch 'stabilization/2106' into cpack/2106-license-url 2021-06-23 15:27:53 -07:00
Scott Romero 2480dedcd9 [stabilization/2106] Inclusion of 3rd party license manifest file in installer package (#1483) 2021-06-23 14:07:02 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
scottr 4b9c7c79b8 [cpack/2106-license-url] update to use correct license URL for installer job 2021-06-23 10:28:46 -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
SJ cb2d64b205 Add parameters to specify custom native build path and enable unity build in Android gradle builds (#1494)
* Add parameters to specify custom native build path and enable unity build in Android gradle builds

* Enable unity build for gradle to shorten the path to the generated object files which fixes build failures on Jenkins due to paths exceeding limit. This also speeds up builds.
2021-06-22 15:31:52 -07:00
scottr 46f7ecb7e6 [cpack/2106-license-url] update installer job to include license terms url 2021-06-22 15:20:36 -07:00
scottr e568004dd2 [cpack/2106-3p-manifest] update installer job with 3rd party SPDX license url 2021-06-22 14:16:33 -07:00
scottr 64a960e428 Merge branch 'cpack/jenkins-main' of https://github.com/aws-lumberyard-dev/o3de into cpack/jenkins-main 2021-06-20 20:21:48 -07:00
scottr 00bb33587a [cpack/jenkins-main] fixed bug applying some cpack build job parameters 2021-06-20 20:17:11 -07:00
scottr 26017c1b49 Merge branch 'stabilization/2106' into cpack/jenkins-main 2021-06-20 17:49:23 -07:00
scottr 3ca839a580 [cpack/jenkins-main] update installer job params and how they are applied 2021-06-20 14:45:03 -07:00
scottr e8f250bed8 [cpack/jenkins-main] rework build tag generation to be at cpack time through LY_INSTALLER_AUTO_GEN_TAG 2021-06-20 14:31:10 -07:00
scottr c507422760 [cpack/jenkins-main] update build url tag generation to use existing env vars from Jenkins 2021-06-18 20:52:04 -07:00
scottr a057cbb03a [cpack/jenkins-main] updated installer job params 2021-06-18 17:16:26 -07:00
scottr 8b68aa9f5a [cpack/jenkins-main] rework build tagging to include git repo info in installer job 2021-06-18 16:55:22 -07:00
amzn-hdoke 556d607a5e Make AWSCore.Editor tests windows only (#1410) 2021-06-18 16:30:49 -07:00
scottr 1519180cec [cpack/stabilization/2106-jenkins] updated installer job params to make the online version 2021-06-18 08:39:40 -07:00
scottr 7011bb66f1 [cpack/stabilization/2106-jenkins] missed cpack log file path shortening 2021-06-18 08:36:28 -07:00
scottr 1d8fb2a7f7 [cpack/stabilization/2106-jenkins] fixed installer framework include in jenkins job 2021-06-18 08:20:40 -07:00
scottr 059324add9 [cpack/stabilization/2106-jenkins] updated installer job tags to run nightly 2021-06-18 08:15:59 -07:00
scottr 8279b65622 [cpack/stabilization/2106-jenkins] updated installer job temp dir to use WORKSPACE_TMP and added log file dump on error 2021-06-18 08:14:47 -07:00
amzn-hdoke 11c3a75321 Enable Client Auth unit test on Linux (#1312) 2021-06-14 13:54:04 -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
Esteban Papp 1396110f6d Preventing builds from cleaning on each step (#1151) 2021-06-04 15:46:19 -07:00
Esteban Papp cf35585bc0 Making incremental linking off by default (#1154) 2021-06-04 15:25:57 -07:00
scottr 0d1b217b24 Merge branch 'main' into cpack_installer 2021-06-04 06:45:43 -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
scottr bcef8856ff [cpack_installer] minor wording fixes 2021-06-03 10:51:13 -07:00
scottr 8214706ff9 [cpack_installer] reworked how packaging is enabled for windows 2021-06-03 08:24:01 -07:00
scottr 5695681ed3 [cpack_installer] fifth attempt to fix cpack selection 2021-06-02 21:03:41 -07:00
scottr 3f9811e498 [cpack_installer] fifth attempt to fix cpack selection 2021-06-02 18:40:22 -07:00
scottr 01f3ba5608 [cpack_installer] fourth attempt to fix cpack selection 2021-06-02 17:58:58 -07:00
scottr 201d6b1b72 [cpack_installer] third attempt to fix cpack selection 2021-06-02 17:29:50 -07:00
scottr fd8cff6aec [cpack_installer] second attempt to fix cpack selection 2021-06-02 16:10:41 -07:00
scottr 197241f16d [cpack_installer] fixed issue with cpack selection 2021-06-02 15:40:41 -07:00
scottr 134258c18a [cpack_installer] add trailing newline to some new files 2021-06-02 15:03:26 -07:00
scottr c6e4e3ed1f [cpack_installer] few more small fixes to installer Jenkins scripts 2021-06-02 14:57:18 -07:00
scottr 4b40f23d0b [cpack_installer] couple small fixes to installer Jenkins scripts 2021-06-02 14:06:27 -07:00
scottr a1b8d1233c [cpack_installer] initial work for installer Jenkins jobs 2021-06-02 11:28:22 -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
Steve Pham bf0df4b369 Add Android 'gradle' job as a default job (#1082)
* Add Android 'gradle' job as a default job

* Replace warning about version checking type with string preprocessing of the captured version before comparisons
2021-06-01 16:37:30 -07:00
Steve Pham 74ec7a362b Update Android Project Generation to support AGP 4.2.0, Cmake 3.20, and newer versions of NDK&SDK
- build.gradle format updates for newer Android Gradle Plugin
- Remove hard coded Android Gradle Plugin version 3.6.4 to be passed in from command args
- Set Android Gradle Plugin min version 4.2.0 in order to support Min CMake version 3.20
- Add ability to use the android sdk to install missing components if needed rather than doing it externally
- Removed argument to pass in the NDK folder to use the android, use the android-sdk instead. Can request specific NDK versions if possible
- Android Gradle Plugin has dependencies by version and is being managed
- More defaults based on tools on path, agp version made possible so they are no longer needed in the command args
2021-05-28 23:24:51 -07:00
pappeste 58bad80ffa changing paths for the install location in Jenkins 2021-05-28 00:17:20 -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
Steve Pham d4587d1f99 Add Label Exclusion filter for Sandbox tests from the main test suites (#955) 2021-05-26 10:14:18 -07:00
lumberyard-employee-dm 76fe7f3666 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 23:48:55 -05:00
Steve Pham 6136bc270e Remove flaky test from AzNetwork instead of using retry
- Remove '--repeat until-pass' from profile test ctest argument
- Moved flaky TCP tests from main googletest suite to sandbox
- Added 'TARGET' to 'ly_add_googletest' to support adding the same module to multiple tests or adding a test that is not named the same as the module
- Fix minor bug in ly_add_googletest
2021-05-25 16:05:40 -07: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