test

scripts/setup-adapters.sh

@@ -64,14 +64,16 @@ function install_gcs-sdk-cpp {
 function install_azure-storage-sdk-cpp {
   github_checkout azure/azure-sdk-for-cpp azure-storage-blobs_12.8.0
 
-  # build and install azure-core with the version compatible with system pre-installed openssl
-  openssl_version=$(openssl version -v | awk '{print $2}')
-  if [[ "$openssl_version" == 1.1.1* ]]; then
-    openssl_version="1.1.1n"
-  fi
   cd sdk/core/azure-core
-  sed -i 's/"version-string"/"builtin-baseline": "dafef74af53669ef1cc9015f55e0ce809ead62aa","version-string"/' vcpkg.json
-  sed -i "s/\"version-string\"/\"overrides\": [{ \"name\": \"openssl\", \"version-string\": \"$openssl_version\" }],\"version-string\"/" vcpkg.json
+  if ! grep -q "baseline" vcpkg.json; then
+    # build and install azure-core with the version compatible with system pre-installed openssl
+    openssl_version=$(openssl version -v | awk '{print $2}')
+    if [[ "$openssl_version" == 1.1.1* ]]; then
+      openssl_version="1.1.1n"
+    fi
+    sed -i 's/"version-string"/"builtin-baseline": "dafef74af53669ef1cc9015f55e0ce809ead62aa","version-string"/' vcpkg.json
+    sed -i "s/\"version-string\"/\"overrides\": [{ \"name\": \"openssl\", \"version-string\": \"$openssl_version\" }],\"version-string\"/" vcpkg.json
+  fi
   cmake_install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
 
   cd -
@@ -82,7 +84,9 @@ function install_azure-storage-sdk-cpp {
   cd -
   # install azure-storage-blobs
   cd sdk/storage/azure-storage-blobs
-  sed -i 's/"version-semver"/"builtin-baseline": "dafef74af53669ef1cc9015f55e0ce809ead62aa","version-semver"/' vcpkg.json
+  if ! grep -q "baseline" vcpkg.json; then
+    sed -i 's/"version-semver"/"builtin-baseline": "dafef74af53669ef1cc9015f55e0ce809ead62aa","version-semver"/' vcpkg.json
+  fi
   cmake_install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
 }
 
@@ -119,7 +123,6 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
       # Dependencies of GCS, probably a workaround until the docker image is rebuilt
       yum -y install curl-devel c-ares-devel
       # Dependencies of Azure Storage Blob Cpp
-      yum -y install gcc-c++
       yum -y install perl-IPC-Cmd
       yum -y install openssl
    fi