Skip to content

Commit

Permalink
Add support for sudo in setup scripts (facebookincubator#8943)
Browse files Browse the repository at this point in the history
Summary:
Ubuntu requires sudo to install at the standard path.

Pull Request resolved: facebookincubator#8943

Reviewed By: Yuhta

Differential Revision: D54593906

Pulled By: kgpai

fbshipit-source-id: cb7ee939d3fdf2675531ce5852c541b89519e07d
  • Loading branch information
majetideepak authored and Joe-Abraham committed Jun 7, 2024
1 parent 577f32c commit 8557d4d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
pull_request:
paths:
- ".github/workflows/scheduled.yml"
- scripts/*

schedule:
- cron: '0 3 * * *'
Expand Down Expand Up @@ -75,7 +76,7 @@ jobs:
ref: "${{ inputs.ref || 'main' }}"

- name: "Install dependencies"
run: cd velox && source ./scripts/setup-ubuntu.sh
run: cd velox && sudo ./scripts/setup-ubuntu.sh

- name: "Build"
run: |
Expand Down Expand Up @@ -125,7 +126,7 @@ jobs:
ref: "${{ inputs.ref || 'main' }}"

- name: "Install dependencies"
run: source ./scripts/setup-ubuntu.sh
run: sudo ./scripts/setup-ubuntu.sh

- name: Download presto fuzzer
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -173,7 +174,7 @@ jobs:
ref: "${{ inputs.ref || 'main' }}"

- name: "Install dependencies"
run: source ./scripts/setup-ubuntu.sh
run: sudo ./scripts/setup-ubuntu.sh

- name: Download spark expression fuzzer
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -247,7 +248,7 @@ jobs:
ref: "${{ inputs.ref || 'main' }}"

- name: "Install dependencies"
run: source ./scripts/setup-ubuntu.sh
run: sudo ./scripts/setup-ubuntu.sh

- name: Download aggregation fuzzer
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -288,7 +289,7 @@ jobs:
ref: "${{ inputs.ref || 'main' }}"

- name: "Install dependencies"
run: source ./scripts/setup-ubuntu.sh
run: sudo ./scripts/setup-ubuntu.sh

- name: Download join fuzzer
uses: actions/download-artifact@v3
Expand Down
3 changes: 2 additions & 1 deletion scripts/setup-helper-functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand All @@ -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
}

1 change: 1 addition & 0 deletions scripts/setup-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ BOOST_VERSION=boost-1.84.0
NPROC=$(getconf _NPROCESSORS_ONLN)
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
export CMAKE_BUILD_TYPE=Release
export SUDO=sudo

# Install all velox and folly dependencies.
# The is an issue on 22.04 where a version conflict prevents glog install,
Expand Down

0 comments on commit 8557d4d

Please sign in to comment.