address review comments

facebookincubator · Jan 25, 2024 · 4be969d · 4be969d
1 parent 48a8fc8
commit 4be969d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/scripts/setup-adapters.sh b/scripts/setup-adapters.sh
@@ -23,6 +23,7 @@ SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
 source $SCRIPTDIR/setup-helper-functions.sh
 DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
 CMAKE_BUILD_TYPE="${BUILD_TYPE:-Release}"
+MACHINE=$(uname -m)
 
 function install_aws_deps {
   local AWS_REPO_NAME="aws/aws-sdk-cpp"
@@ -31,12 +32,25 @@ function install_aws_deps {
   github_checkout $AWS_REPO_NAME $AWS_SDK_VERSION --depth 1 --recurse-submodules
   cmake_install -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS:BOOL=OFF -DMINIMIZE_SIZE:BOOL=ON -DENABLE_TESTING:BOOL=OFF -DBUILD_ONLY:STRING="s3;identity-management"
   # Dependencies for S3 testing
+  # We need this specific version of Minio for testing.
   if [[ "$OSTYPE" == linux-gnu* ]]; then
     wget https://dl.min.io/server/minio/release/linux-amd64/archive/minio-20220526054841.0.0.x86_64.rpm
-    rpm -i minio-20220526054841.0.0.x86_64.rpm
+    rpm -i --force minio-20220526054841.0.0.x86_64.rpm
     rm minio-20220526054841.0.0.x86_64.rpm
   fi
-
+  # minio will have to approved under the Privacy & Security on MacOS on first use.
+  if [[ "$OSTYPE" == darwin* ]]; then
+    if [ "$MACHINE" = "x86_64" ]; then
+      wget https://dl.min.io/server/minio/release/darwin-arm64/archive/minio.RELEASE.2022-05-26T05-48-41Z -O minio
+      chmod +x ./minio
+      sudo mv ./minio /usr/local/bin/
+    fi
+    if [ "$MACHINE" = "arm64" ]; then
+      wget https://dl.min.io/server/minio/release/darwin-arm64/archive/minio.RELEASE.2022-05-26T05-48-41Z -O minio
+      chmod +x ./minio
+      sudo mv ./minio /usr/local/bin/
+    fi
+  fi
 }
 
 function install_gcs-sdk-cpp {

diff --git a/scripts/setup-centos8.sh b/scripts/setup-centos8.sh
@@ -64,7 +64,6 @@ wget_and_untar https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/
 wget_and_untar https://github.com/google/snappy/archive/1.1.8.tar.gz snappy
 wget_and_untar https://github.com/fmtlib/fmt/archive/10.1.1.tar.gz fmt
 
-#  wget_and_untar https://github.com/ericniebler/range-v3/archive/0.11.0.tar.gz ranges-v3
 wget_and_untar https://github.com/protocolbuffers/protobuf/releases/download/v21.4/protobuf-all-21.4.tar.gz protobuf
 
 FB_OS_VERSION="v2023.12.04.00"
@@ -112,7 +111,6 @@ cmake_install fizz/fizz -DBUILD_TESTS=OFF
 cmake_install wangle/wangle -DBUILD_TESTS=OFF
 cmake_install mvfst -DBUILD_TESTS=OFF
 cmake_install fbthrift -Denable_tests=OFF
-# cmake_install ranges-v3
 
 if $BUILD_DUCKDB ; then
   echo 'Building DuckDB'