Skip to content

Commit

Permalink
Update for Conan 2
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Jan 30, 2025
1 parent 0f2b3fe commit 4cbbc18
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ci/scripts/conan_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ build_dir=${1}
shift

export ARROW_HOME=${source_dir}
export CONAN_HOOK_ERROR_LEVEL=40

conan_args=()
conan_args+=(--build=missing)
Expand Down Expand Up @@ -67,6 +66,7 @@ fi

version=$(grep '^set(ARROW_VERSION ' ${ARROW_HOME}/cpp/CMakeLists.txt | \
grep -E -o '([0-9.]*)')
conan_args+=(--version ${version})

rm -rf ~/.conan/data/arrow/
rm -rf ${build_dir}/conan || sudo rm -rf ${build_dir}/conan
Expand All @@ -78,4 +78,4 @@ else
sudo chown -R $(id -u):$(id -g) ${build_dir}/conan/
fi
cd ${build_dir}/conan/all
conan create . arrow/${version}@ "${conan_args[@]}" "$@"
conan create . "${conan_args[@]}" "$@"
3 changes: 1 addition & 2 deletions ci/scripts/conan_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@

set -eux

conan config install https://github.com/conan-io/hooks.git -sf hooks -tf hooks
conan config set hooks.conan-center
conan profile detect

0 comments on commit 4cbbc18

Please sign in to comment.