Fix Ubuntu dependency install in github actions

facebookincubator · Mar 5, 2024 · 4360b8c · 4360b8c
1 parent ccb464b
commit 4360b8c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -88,7 +88,7 @@ jobs:
 
       - name: "Install dependencies"
         if: ${{ github.event_name == 'pull_request' }}
-        run: source velox/scripts/setup-ubuntu.sh
+        run: ./velox/scripts/setup-ubuntu.sh
 
       - name: Build Baseline Benchmarks
         if: ${{ github.event_name == 'pull_request' }}
@@ -115,7 +115,7 @@ jobs:
           submodules: 'recursive'
 
       - name: "Install dependencies"
-        run: source velox/scripts/setup-ubuntu.sh
+        run: ./velox/scripts/setup-ubuntu.sh
 
       - name: Build Contender Benchmarks
         working-directory: velox

diff --git a/scripts/setup-helper-functions.sh b/scripts/setup-helper-functions.sh
@@ -158,6 +158,7 @@ function cmake_install {
   mkdir -p "${BINARY_DIR}"
   CPU_TARGET="${CPU_TARGET:-unknown}"
   COMPILER_FLAGS=$(get_cxx_flags $CPU_TARGET)
+  SUDO="${SUDO:-""}"
 
   # CMAKE_POSITION_INDEPENDENT_CODE is required so that Velox can be built into dynamic libraries \
   cmake -Wno-dev -B"${BINARY_DIR}" \
@@ -169,6 +170,6 @@ function cmake_install {
     -DCMAKE_CXX_FLAGS="$COMPILER_FLAGS" \
     -DBUILD_TESTING=OFF \
     "$@"
-  ninja -C "${BINARY_DIR}" install
+  ${SUDO} ninja -C "${BINARY_DIR}" install
 }
 
diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
@@ -29,6 +29,7 @@ BOOST_VERSION=boost-1.84.0
 NPROC=$(getconf _NPROCESSORS_ONLN)
 DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
 export CMAKE_BUILD_TYPE=Release
+SUDO=sudo
 
 # Install all velox and folly dependencies.
 # The is an issue on 22.04 where a version conflict prevents glog install,