diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 16:49:28 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 16:49:28 -0400 |
| commit | 626920dda38a512b27c5e8fd79b0c9b09be01898 (patch) | |
| tree | 89c54e31848048ee084005fd3a0a1316f5530966 /build.sh | |
| parent | f6b3b5e803b0c08d55ecd10eac3e9e75518760a9 (diff) | |
| parent | d8e52ec001c476a2320f2d5caceb813465d707e4 (diff) | |
Merge remote branch 'develop' into release/luau-scripting for Maint B
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 29 |
1 files changed, 27 insertions, 2 deletions
@@ -45,7 +45,7 @@ build_dir_Darwin() build_dir_Linux() { - echo build-linux-i686 + echo build-linux-x86_64 } build_dir_CYGWIN() @@ -163,6 +163,22 @@ pre_build() fi fi + if [[ "$arch" == "Linux" ]] + then + # RELEASE_CRASH_REPORTING is tuned on unconditionaly, this is fine but not for Linux as of now (due to missing breakpad/crashpad support) + RELEASE_CRASH_REPORTING=OFF + + # Builds turn on HAVOK even when config is ReleaseOS. + # This needs AUTOBUILD_GITHUB_TOKEN to be set in the environment. But this is not set for PRs apparently. + # Still this seemlingy works on Windows and Mac, why not on the Linux runner? Mystery to be solved elsewhere. + + + if [[ "$variant" == "ReleaseOS" ]] + then + HAVOK=OFF + fi + fi + if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ] then case "$arch" in @@ -185,9 +201,17 @@ pre_build() # honor autobuild_configure_parameters same as sling-buildscripts eval_autobuild_configure_parameters=$(eval $(echo echo $autobuild_configure_parameters)) + # We build the viewer on Linux, but we haven't committed to support the + # Linux viewer. As of 2024-05-30, Linux build-time test infrastructure is + # not in place, so don't even bother running tests on Linux. + if [[ "$RUNNER_OS" == "Linux" ]] + then LL_TESTS=OFF + else LL_TESTS=ON + fi + "$autobuild" configure --quiet -c $variant \ ${eval_autobuild_configure_parameters:---} \ - -DLL_TESTS:BOOL=ON \ + -DLL_TESTS:BOOL=$LL_TESTS \ -DPACKAGE:BOOL=ON \ -DHAVOK:BOOL="$HAVOK" \ -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ @@ -196,6 +220,7 @@ pre_build() -DVIEWER_CHANNEL:STRING="${viewer_channel}" \ -DGRID:STRING="\"$viewer_grid\"" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \ + $CMAKE_OPTIONS \ "${SIGNING[@]}" \ || fatal "$variant configuration failed" |