mirror of
https://github.com/open-goal/jak-project
synced 2026-08-31 09:41:05 -04:00
ci: install brotli explicitly on macOS runners (#4392)
Another out of no-where regression on the macOS runners... https://github.com/open-goal/jak-project/actions/runs/32795420246 ``` ld: library 'brotlidec' not found ```
This commit is contained in:
@@ -29,9 +29,9 @@ jobs:
|
||||
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
||||
HOMEBREW_NO_ANALYTICS: 1
|
||||
run: |
|
||||
if ! brew install ninja nasm openssl@3; then
|
||||
if ! brew install ninja nasm openssl@3 brotli; then
|
||||
brew update
|
||||
brew install ninja nasm openssl@3
|
||||
brew install ninja nasm openssl@3 brotli
|
||||
fi
|
||||
# keg-only, so give CMake's FindOpenSSL an explicit hint
|
||||
echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> $GITHUB_ENV
|
||||
|
||||
@@ -39,9 +39,9 @@ jobs:
|
||||
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
||||
HOMEBREW_NO_ANALYTICS: 1
|
||||
run: |
|
||||
if ! brew install ninja nasm openssl@3; then
|
||||
if ! brew install ninja nasm openssl@3 brotli; then
|
||||
brew update
|
||||
brew install ninja nasm openssl@3
|
||||
brew install ninja nasm openssl@3 brotli
|
||||
fi
|
||||
# keg-only, so give CMake's FindOpenSSL an explicit hint
|
||||
echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> $GITHUB_ENV
|
||||
|
||||
+2
-2
@@ -228,8 +228,8 @@ set(CURL_USE_LIBSSH2 OFF)
|
||||
set(CURL_USE_LIBPSL OFF)
|
||||
set(CURL_ZLIB OFF)
|
||||
# these default to AUTO since curl 8.10 and would silently pick up system libs
|
||||
set(CURL_BROTLI OFF)
|
||||
set(CURL_ZSTD OFF)
|
||||
set(CURL_BROTLI OFF CACHE BOOL "Disable Brotli support" FORCE)
|
||||
set(CURL_ZSTD OFF CACHE BOOL "Disable zstd support" FORCE)
|
||||
# curl's BUILD_EXAMPLES cache option (default ON) would otherwise leak into
|
||||
# discord-rpc's identically named option and break its examples add_subdirectory
|
||||
set(BUILD_EXAMPLES OFF)
|
||||
|
||||
Reference in New Issue
Block a user