refactor: Setup scripts

.github/workflows/linux-build.yml

@@ -25,6 +25,8 @@ on:
       - "CMake/**"
       - "third_party/**"
       - "scripts/setup-ubuntu.sh"
+      - "scripts/setup-common.sh"
+      - "scripts/setup-versions.sh"
       - "scripts/setup-helper-functions.sh"
       - ".github/workflows/linux-build.yml"
       - ".github/workflows/linux-build-base.yml"
@@ -36,6 +38,8 @@ on:
       - "CMakeLists.txt"
       - "CMake/**"
       - "third_party/**"
+      - "scripts/setup-common.sh"
+      - "scripts/setup-versions.sh"
       - "scripts/setup-ubuntu.sh"
       - "scripts/setup-helper-functions.sh"
       - ".github/workflows/linux-build.yml"

.github/workflows/macos.yml

@@ -67,7 +67,7 @@ jobs:
         env:
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "TRUE"
         run: |
-          source scripts/setup-macos.sh
+          scripts/setup-macos.sh
           install_build_prerequisites
           install_velox_deps_from_brew
           install_double_conversion
@@ -84,7 +84,6 @@ jobs:
 
       - name: Configure Build
         env:
-          folly_SOURCE: BUNDLED #brew folly does not have int128
           fmt_SOURCE: BUNDLED #brew fmt11 is not supported
         run: |
             ccache -sz -M 5Gi

.github/workflows/scheduled.yml

@@ -23,6 +23,8 @@ on:
       - "CMake/**"
       - "third_party/**"
       - "scripts/setup-ubuntu.sh"
+      - "scripts/setup-common.sh"
+      - "scripts/setup-versions.sh"
       - "scripts/setup-helper-functions.sh"
       - ".github/workflows/scheduled.yml"
       - "setup.py"
@@ -37,6 +39,8 @@ on:
       - "CMake/**"
       - "third_party/**"
       - "scripts/setup-ubuntu.sh"
+      - "scripts/setup-common.sh"
+      - "scripts/setup-versions.sh"
       - "scripts/setup-helper-functions.sh"
       - ".github/workflows/scheduled.yml"
 

README.md

@@ -176,11 +176,13 @@ libraries. Once you have checked out Velox, you can setup and build like so:
 
 ```shell
 $ ./scripts/setup-centos9.sh
-$ ./scripts/setup-adapters.sh
+$ ./scripts/setup-centos9.sh install_adapters
 $ make
 ```
 
-Note that `setup-adapters.sh` supports macOS and Ubuntu 20.04 or later.
+Note that the `install_adapters` command is available for the supported MacOS and
+Ubuntu (20.04 or later) scripts. Individual adapters can be installed by specifying
+the individual install command, e.g. `setup-centos9.sh install_aws`.
 
 ### Using Clang on Linux
 

scripts/adapters.dockerfile

@@ -15,10 +15,12 @@
 ARG image=ghcr.io/facebookincubator/velox-dev:centos9
 FROM $image
 
+COPY scripts/setup-centos9.sh /
+COPY scripts/setup-common.sh /
+COPY scripts/setup-versions.sh /
 COPY scripts/setup-helper-functions.sh /
-COPY scripts/setup-adapters.sh /
 RUN mkdir build && ( cd build &&  source /opt/rh/gcc-toolset-12/enable && \
-    bash /setup-adapters.sh ) && rm -rf build && dnf remove -y conda && dnf clean all
+    bash /setup-centos9.sh install_adapters ) && rm -rf build && dnf remove -y conda && dnf clean all
 
 # install miniforge
 RUN curl -L -o /tmp/miniforge.sh https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-Linux-x86_64.sh && \

scripts/centos.dockerfile

@@ -16,6 +16,8 @@ ARG image=quay.io/centos/centos:stream9
 FROM $image
 
 COPY scripts/setup-helper-functions.sh /
+COPY scripts/setup-versions.sh /
+COPY scripts/setup-common.sh /
 COPY scripts/setup-centos9.sh /
 
 # Building libvelox.so requires folly and gflags to be built shared as well for now