mirror of
https://github.com/open-goal/jak-project
synced 2026-08-30 17:30:03 -04:00
ci: fix another macOS dependency (http2) (#4393)
These dependencies only crop up under the static build i suppose, brotli was fixed, but now http/2 support is the new failure. Will actually verify they will work here before merging this time.
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 brotli; then
|
||||
if ! brew install ninja nasm openssl@3 brotli nghttp2; then
|
||||
brew update
|
||||
brew install ninja nasm openssl@3 brotli
|
||||
brew install ninja nasm openssl@3 brotli nghttp2
|
||||
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 brotli; then
|
||||
if ! brew install ninja nasm openssl@3 brotli nghttp2; then
|
||||
brew update
|
||||
brew install ninja nasm openssl@3 brotli
|
||||
brew install ninja nasm openssl@3 brotli nghttp2
|
||||
fi
|
||||
# keg-only, so give CMake's FindOpenSSL an explicit hint
|
||||
echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> $GITHUB_ENV
|
||||
|
||||
@@ -230,6 +230,7 @@ set(CURL_ZLIB OFF)
|
||||
# these default to AUTO since curl 8.10 and would silently pick up system libs
|
||||
set(CURL_BROTLI OFF CACHE BOOL "Disable Brotli support" FORCE)
|
||||
set(CURL_ZSTD OFF CACHE BOOL "Disable zstd support" FORCE)
|
||||
set(USE_NGHTTP2 OFF CACHE BOOL "Disable nghttp2 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