From 553a713aed3794f454fa7b45a1f1ef443bbb914a Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Mon, 24 Aug 2026 22:52:11 -0400 Subject: [PATCH] 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. --- .github/workflows/macos-build-arm.yaml | 4 ++-- .github/workflows/macos-build.yaml | 4 ++-- CMakeLists.txt | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos-build-arm.yaml b/.github/workflows/macos-build-arm.yaml index 069d02afff..6798d4c80e 100644 --- a/.github/workflows/macos-build-arm.yaml +++ b/.github/workflows/macos-build-arm.yaml @@ -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 diff --git a/.github/workflows/macos-build.yaml b/.github/workflows/macos-build.yaml index d76369cbfa..6e6b60162c 100644 --- a/.github/workflows/macos-build.yaml +++ b/.github/workflows/macos-build.yaml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index f681771a0b..5e946ede46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)