Refactor setup scripts

.github/workflows/linux-build.yml

@@ -25,6 +25,9 @@ on:
       - "CMake/**"
       - "third_party/**"
       - "scripts/setup-ubuntu.sh"
+      - "scripts/setup-common.sh"
+      - "scripts/setup-linux.sh"
+      - "scripts/setup-versions.sh"
       - "scripts/setup-helper-functions.sh"
       - ".github/workflows/linux-build.yml"
 
@@ -36,6 +39,9 @@ on:
       - "CMake/**"
       - "third_party/**"
       - "scripts/setup-ubuntu.sh"
+      - "scripts/setup-common.sh"
+      - "scripts/setup-linux.sh"
+      - "scripts/setup-versions.sh"
       - "scripts/setup-helper-functions.sh"
       - ".github/workflows/linux-build.yml"
 
@@ -171,7 +177,7 @@ jobs:
           MAKEFLAGS: "NUM_THREADS=8 MAX_HIGH_MEM_JOBS=4 MAX_LINK_JOBS=4"
           EXTRA_CMAKE_FLAGS: "-DVELOX_ENABLE_ARROW=ON"
         run: |
-          make debug 
+          make debug
 
       - name: CCache after
         run: |

.github/workflows/scheduled.yml

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

README.md

@@ -132,11 +132,12 @@ 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 supports MacOS and
+Ubuntu (20.04 or later) scripts.
 
 ### Building Velox
 

scripts/adapters.dockerfile

@@ -15,15 +15,19 @@
 ARG image=ghcr.io/facebookincubator/velox-dev:centos9
 FROM $image
 
-COPY scripts/setup-adapters.sh /
+COPY scripts/setup-centos9.sh /
+COPY scripts/setup-linux.sh /
+COPY scripts/setup-common.sh /
+COPY scripts/setup-versions.sh /
+COPY scripts/setup-helper-functions.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 && \
     bash /tmp/miniforge.sh -b -p /opt/miniforge && \
     rm /tmp/miniforge.sh
-ENV PATH=/opt/miniforge/condabin:${PATH} 
+ENV PATH=/opt/miniforge/condabin:${PATH}
 
 # install test dependencies
 RUN mamba create -y --name adapters python=3.8