summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-08-06 16:58:06 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-08-06 17:55:41 +0300
commit143168f9d95afeac2058efa4f54435a654c770f8 (patch)
tree42b98cc575a1104c3668e865ddab76ff012acb77
parent2795fe9786c96b057dee4ce6f4fd1504117e6f78 (diff)
Force ReleaseOS builds on Linux
-rw-r--r--.github/workflows/build.yaml6
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake1
-rwxr-xr-xindra/newview/viewer_manifest.py1
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