Skip to content

ARROW-16219: [CI] Fix git config to prevent SCM tools failure #12945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
raulcd wants to merge 6 commits into from
Closed

ARROW-16219: [CI] Fix git config to prevent SCM tools failure #12945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e9e662
ARROW-162219: [CI] Fix git config to prevent SCM tools failure findin…
raulcd Apr 21, 2022
26d9eff
ARROW-16219: Fix verify-release-candidate allowing ARROW_SOURCE_DIR a…
raulcd Apr 21, 2022
6b96565
ARROW-16219: [CI] Removed git safe directory from verify-release-cand…
raulcd Apr 21, 2022
64d62f5
ARROW-16219: [CI] Ensure git command is present
raulcd Apr 22, 2022
f843ea7
ARROW-16219: [CI] Fix argument to git command
raulcd Apr 22, 2022
5a0d6fe
ARROW-16219: [CI] Attempt to fix ubuntu-lint jobs
raulcd Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ci/scripts/cpp_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ build_dir=${2}/cpp
: ${ARROW_USE_CCACHE:=OFF}
: ${BUILD_DOCS_CPP:=OFF}

if [ -x "$(command -v git)" ]; then
git config --global --add safe.directory ${1}
fi

# TODO(kszucs): consider to move these to CMake
if [ ! -z "${CONDA_PREFIX}" ]; then
echo -e "===\n=== Conda environment for build\n==="
Expand Down
4 changes: 4 additions & 0 deletions ci/scripts/python_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ python_build_dir=${build_dir}/python

: ${BUILD_DOCS_PYTHON:=OFF}

if [ -x "$(command -v git)" ]; then
git config --global --add safe.directory ${arrow_dir}
fi

case "$(uname)" in
Linux)
n_jobs=$(nproc)
Expand Down
6 changes: 5 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,10 @@ services:
environment:
<<: *ccache
volumes: *ubuntu-volumes
command: archery lint --all --no-clang-tidy --no-iwyu --no-numpydoc
command: >
/bin/bash -c "
git config --global --add safe.directory /arrow &&
archery lint --all --no-clang-tidy --no-iwyu --no-numpydoc"

######################### Integration Tests #################################

Expand Down Expand Up @@ -1733,6 +1736,7 @@ services:
command: >
/bin/bash -c "
apt update -y && apt install -y curl git gnupg tzdata wget &&
git config --global --add safe.directory /arrow &&
/arrow/dev/release/verify-release-candidate.sh $${VERIFY_VERSION} $${VERIFY_RC}"

almalinux-verify-rc:
Expand Down