From 143168f9d95afeac2058efa4f54435a654c770f8 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 6 Aug 2024 16:58:06 +0300 Subject: Force ReleaseOS builds on Linux --- .github/workflows/build.yaml | 6 ++++++ indra/cmake/Copy3rdPartyLibs.cmake | 1 - indra/newview/viewer_manifest.py | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b060ba35e3..4594355732 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,6 +48,12 @@ jobs: matrix: runner: [windows-large, macos-12-xl, linux-large] configuration: ${{ fromJSON(needs.setup.outputs.configurations) }} + include: + - runner: linux-large + configuration: ReleaseOS + exclude: + - runner: linux-large + configuration: Release runs-on: ${{ matrix.runner }} outputs: viewer_channel: ${{ steps.build.outputs.viewer_channel }} diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index bed365fdda..4626e9d0d9 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -226,7 +226,6 @@ elseif(LINUX) list( APPEND release_files libapr-1.so.0 libaprutil-1.so.0 - libhunspell-1.3.so.0.0.0 ) endif() diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 8600efc91e..24b43192a9 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1428,7 +1428,6 @@ class Linux_x86_64_Manifest(LinuxManifest): self.path_optional("libjemalloc*.so") - self.path("libhunspell-1.3.so*") self.path("libalut.so*") self.path("libopenal.so*") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname -- cgit v1.2.3