From 3e9e662b5c84bdafad690ab1b2d7d925f3f70b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Thu, 21 Apr 2022 14:28:14 +0200 Subject: [PATCH 1/6] ARROW-162219: [CI] Fix git config to prevent SCM tools failure finding the version --- ci/scripts/cpp_build.sh | 2 ++ ci/scripts/python_build.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh index 2e6f35936ab..81dd651484b 100755 --- a/ci/scripts/cpp_build.sh +++ b/ci/scripts/cpp_build.sh @@ -25,6 +25,8 @@ build_dir=${2}/cpp : ${ARROW_USE_CCACHE:=OFF} : ${BUILD_DOCS_CPP:=OFF} +git config --global --add safe.directory ${1} + # TODO(kszucs): consider to move these to CMake if [ ! -z "${CONDA_PREFIX}" ]; then echo -e "===\n=== Conda environment for build\n===" diff --git a/ci/scripts/python_build.sh b/ci/scripts/python_build.sh index 1f8b19b6816..b832f7c6811 100755 --- a/ci/scripts/python_build.sh +++ b/ci/scripts/python_build.sh @@ -27,6 +27,8 @@ python_build_dir=${build_dir}/python : ${BUILD_DOCS_PYTHON:=OFF} +git config --global --add safe.directory ${arrow_dir} + case "$(uname)" in Linux) n_jobs=$(nproc) From 26d9effdd89831f32c57257bb3535e3ae9524d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Thu, 21 Apr 2022 15:46:50 +0200 Subject: [PATCH 2/6] ARROW-16219: Fix verify-release-candidate allowing ARROW_SOURCE_DIR as git safe directory --- dev/release/verify-release-candidate.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index c61a55db6b3..7317705c0ad 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -895,6 +895,8 @@ ensure_source_directory() { fi fi + # Ensure ARROW_SOURCE_DIR is a safe.directory for git + git config --global --add safe.directory $ARROW_SOURCE_DIR # Ensure that the testing repositories are cloned if [ ! -d "${ARROW_SOURCE_DIR}/testing/data" ]; then git clone https://github.com/apache/arrow-testing.git ${ARROW_SOURCE_DIR}/testing From 6b965650ef67119e03e5086fcb2dc269ca020ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Thu, 21 Apr 2022 17:34:10 +0200 Subject: [PATCH 3/6] ARROW-16219: [CI] Removed git safe directory from verify-release-candidate script and add it to the docker-compose file --- dev/release/verify-release-candidate.sh | 2 -- docker-compose.yml | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index 7317705c0ad..c61a55db6b3 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -895,8 +895,6 @@ ensure_source_directory() { fi fi - # Ensure ARROW_SOURCE_DIR is a safe.directory for git - git config --global --add safe.directory $ARROW_SOURCE_DIR # Ensure that the testing repositories are cloned if [ ! -d "${ARROW_SOURCE_DIR}/testing/data" ]; then git clone https://github.com/apache/arrow-testing.git ${ARROW_SOURCE_DIR}/testing diff --git a/docker-compose.yml b/docker-compose.yml index f3c67fc4af7..e353358505b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1733,6 +1733,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: From 64d62f57641cbbd06563513a97033a2a3930ba1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 10:32:59 +0200 Subject: [PATCH 4/6] ARROW-16219: [CI] Ensure git command is present --- ci/scripts/cpp_build.sh | 4 +++- ci/scripts/python_build.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh index 81dd651484b..22120d2fe68 100755 --- a/ci/scripts/cpp_build.sh +++ b/ci/scripts/cpp_build.sh @@ -25,7 +25,9 @@ build_dir=${2}/cpp : ${ARROW_USE_CCACHE:=OFF} : ${BUILD_DOCS_CPP:=OFF} -git config --global --add safe.directory ${1} +if [ -x "$(command -v git)" ]; then + git config --global --add safe.directory ${arrow_dir} +fi # TODO(kszucs): consider to move these to CMake if [ ! -z "${CONDA_PREFIX}" ]; then diff --git a/ci/scripts/python_build.sh b/ci/scripts/python_build.sh index b832f7c6811..e87117ce877 100755 --- a/ci/scripts/python_build.sh +++ b/ci/scripts/python_build.sh @@ -27,7 +27,9 @@ python_build_dir=${build_dir}/python : ${BUILD_DOCS_PYTHON:=OFF} -git config --global --add safe.directory ${arrow_dir} +if [ -x "$(command -v git)" ]; then + git config --global --add safe.directory ${arrow_dir} +fi case "$(uname)" in Linux) From f843ea7f56b950de3f7bc630fd3f39f0adbf37ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 10:51:55 +0200 Subject: [PATCH 5/6] ARROW-16219: [CI] Fix argument to git command --- ci/scripts/cpp_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh index 22120d2fe68..37484cc8384 100755 --- a/ci/scripts/cpp_build.sh +++ b/ci/scripts/cpp_build.sh @@ -26,7 +26,7 @@ build_dir=${2}/cpp : ${BUILD_DOCS_CPP:=OFF} if [ -x "$(command -v git)" ]; then - git config --global --add safe.directory ${arrow_dir} + git config --global --add safe.directory ${1} fi # TODO(kszucs): consider to move these to CMake From 5a0d6fe904a3f75aba8255ad4219626f903e528f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 11:33:54 +0200 Subject: [PATCH 6/6] ARROW-16219: [CI] Attempt to fix ubuntu-lint jobs --- docker-compose.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e353358505b..4eaf54855df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 #################################