Skip to content

Commit bf2698a

Browse files
committed
Add binutils
1 parent 0bb8bb1 commit bf2698a

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

dev/conbench_envs/hooks.sh

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,22 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20+
set -ex
2021

2122
## These hooks are used by benchmark builds
2223
# to create a conda env with Arrow dependencies and build Arrow C++, Python, etc
2324
create_conda_env_for_benchmark_build() {
24-
conda create -y -n "${BENCHMARKABLE_TYPE}" -c conda-forge \
25-
--file ci/conda_env_unix.txt \
26-
--file ci/conda_env_cpp.txt \
27-
--file ci/conda_env_python.txt \
28-
--file ci/conda_env_gandiva.txt \
29-
compilers \
30-
python="${PYTHON_VERSION}" \
31-
pandas \
32-
aws-sdk-cpp \
33-
r
25+
conda create -q -y -n "${BENCHMARKABLE_TYPE}" -c conda-forge --override-channels \
26+
--file ci/conda_env_unix.txt \
27+
--file ci/conda_env_cpp.txt \
28+
--file ci/conda_env_python.txt \
29+
--file ci/conda_env_gandiva.txt \
30+
binutils \
31+
compilers \
32+
python="${PYTHON_VERSION}" \
33+
pandas \
34+
aws-sdk-cpp \
35+
r
3436
}
3537

3638
activate_conda_env_for_benchmark_build() {
@@ -50,12 +52,7 @@ set_arrow_build_and_run_env_vars() {
5052

5153
build_arrow_cpp() {
5254
export ARROW_BUILD_DIR="/tmp/$(uuidgen)"
53-
# Ignore the error when a cache can't be created
54-
if ! ci/scripts/cpp_build.sh $(pwd) $ARROW_BUILD_DIR 2> error.log; then
55-
if ! grep -q -F "Can\'t create temporary cache file" error.log; then
56-
cat error.log
57-
fi
58-
fi
55+
ci/scripts/cpp_build.sh $(pwd) $ARROW_BUILD_DIR
5956
}
6057

6158
build_arrow_python() {

0 commit comments

Comments
 (0)