Merge branch 'master' into SNOW-864140-update-build-scripts-instruction

snowflakedb · Nov 29, 2024 · 9e98b8c · 9e98b8c
2 parents 5ee80ba + 6283bf5
commit 9e98b8c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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

diff --git 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
@@ -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"