From 3ccfcf9c8f0a6c27af6bfcfaca9c27b52e8a2e48 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 30 May 2024 11:27:27 -0400
Subject: Disable build-time tests on Linux entirely.

Having done that, fall back to default `continue-on-error: false` for all
platforms.
---
 .github/workflows/build.yaml |  2 --
 build.sh                     | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4fe018f3cf..903d54210e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -53,8 +53,6 @@ jobs:
           - runner: linux-large
             configuration: Release
     runs-on: ${{ matrix.runner }}
-    # Linux build failures shouldn't block the whole project.
-    continue-on-error: ${{ matrix.runner == 'linux-large' }}
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
       viewer_version: ${{ steps.build.outputs.viewer_version }}
diff --git a/build.sh b/build.sh
index e5c53c84d2..60c62970df 100755
--- a/build.sh
+++ b/build.sh
@@ -192,9 +192,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" \
-- 
cgit v1.2.3