diff options
| -rw-r--r-- | .github/workflows/build.yaml | 2 | ||||
| -rwxr-xr-x | 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 }} @@ -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" \ |