From 5bb0bd7d08b3748cb2e86b6fe0fa59cdf0cdf0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Szczerbi=C5=84ski?= Date: Wed, 27 Nov 2024 07:06:20 +0100 Subject: [PATCH 1/2] NO-SNOW: Cancel old workflows (#783) --- .github/workflows/build-test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 51f90af704..ae11ecc52d 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -10,6 +10,11 @@ on: branches: - '**' +concurrency: + # older builds for the same pull request numer or branch should be cancelled + cancel-in-progress: true + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + jobs: build-test-linux: name: Build-Test-Linux From 6283bf58b4c57750842eff2c98dcd342d4021b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Kubik?= Date: Wed, 27 Nov 2024 18:08:47 +0100 Subject: [PATCH 2/2] SNOW-1831184 Exclude nghttp2 from curl build on unix (#786) --- 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"