From 007edd2d475a586ccb056b96ccfed47b88fd7b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Kubik?= Date: Wed, 27 Nov 2024 12:13:51 +0100 Subject: [PATCH 1/3] exclude nghttp2 from curl build on unix to prevent build failures on recent macos image --- scripts/build_azuresdk.sh | 2 +- scripts/build_curl.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build_azuresdk.sh b/scripts/build_azuresdk.sh index 58399f547b..594096b429 100755 --- a/scripts/build_azuresdk.sh +++ b/scripts/build_azuresdk.sh @@ -12,7 +12,7 @@ function usage() { set -o pipefail AZURE_SRC_VERSION=0.1.20 -AZURE_BUILD_VERSION=12 +AZURE_BUILD_VERSION=13 AZURE_DIR=azure-storage-cpplite-$AZURE_SRC_VERSION AZURE_VERSION=$AZURE_SRC_VERSION.$AZURE_BUILD_VERSION diff --git a/scripts/build_curl.sh b/scripts/build_curl.sh index 10e38e4a09..8b2462dd82 100755 --- a/scripts/build_curl.sh +++ b/scripts/build_curl.sh @@ -13,7 +13,7 @@ function usage() { set -o pipefail CURL_SRC_VERSION=8.10.1 -CURL_BUILD_VERSION=2 +CURL_BUILD_VERSION=3 CURL_VERSION=${CURL_SRC_VERSION}.${CURL_BUILD_VERSION} DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -51,6 +51,7 @@ curl_configure_opts+=( "--without-brotli" "--without-zstd" "--without-libpsl" + "--without-nghttp2" "--disable-rtsp" "--disable-ldap" "--disable-ldaps" From 5e02f623f1bab266e5b695f5abebc73afd89d058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Kubik?= Date: Wed, 27 Nov 2024 14:44:27 +0100 Subject: [PATCH 2/3] temporarily remove the fix in build curl to investigate the logs of broken build --- scripts/build_curl.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build_curl.sh b/scripts/build_curl.sh index 8b2462dd82..6d1016401f 100755 --- a/scripts/build_curl.sh +++ b/scripts/build_curl.sh @@ -51,7 +51,6 @@ curl_configure_opts+=( "--without-brotli" "--without-zstd" "--without-libpsl" - "--without-nghttp2" "--disable-rtsp" "--disable-ldap" "--disable-ldaps" From e087f973432ec8e9a938fd917c00c288cf979a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Kubik?= Date: Wed, 27 Nov 2024 15:56:53 +0100 Subject: [PATCH 3/3] re-add without-nghttp2 flag to curl build --- scripts/build_curl.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build_curl.sh b/scripts/build_curl.sh index 6d1016401f..8b2462dd82 100755 --- a/scripts/build_curl.sh +++ b/scripts/build_curl.sh @@ -51,6 +51,7 @@ curl_configure_opts+=( "--without-brotli" "--without-zstd" "--without-libpsl" + "--without-nghttp2" "--disable-rtsp" "--disable-ldap" "--disable-ldaps"