From f37cc99ea37f1a42506323a1dd672b1fef5f932e Mon Sep 17 00:00:00 2001
From: Jonathan Keane <jkeane@gmail.com>
Date: Mon, 13 Dec 2021 15:56:35 -0600
Subject: [PATCH 1/3] build > install when we're not using rcmdcheck

---
 ci/scripts/r_build.sh    |  4 +++-
 ci/scripts/r_sanitize.sh |  5 ++++-
 ci/scripts/r_valgrind.sh | 11 +++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ci/scripts/r_build.sh b/ci/scripts/r_build.sh
index a435b04317d..38b54e44340 100755
--- a/ci/scripts/r_build.sh
+++ b/ci/scripts/r_build.sh
@@ -26,7 +26,9 @@ build_dir=${2}
 
 pushd ${source_dir}
 
-${R_BIN} CMD INSTALL ${INSTALL_ARGS} .
+# build first so that any stray compiled files in r/src are ignored
+${R_BIN} CMD build .
+${R_BIN} CMD INSTALL ${INSTALL_ARGS} arrow*.tar.gz
 
 if [ "${BUILD_DOCS_R}" == "ON" ]; then
   ${R_BIN} -e "pkgdown::build_site(install = FALSE)"
diff --git a/ci/scripts/r_sanitize.sh b/ci/scripts/r_sanitize.sh
index 33b43611630..52a6ca7a2b7 100755
--- a/ci/scripts/r_sanitize.sh
+++ b/ci/scripts/r_sanitize.sh
@@ -35,7 +35,10 @@ export CMAKE_BUILD_TYPE=RelWithDebInfo
 ncores=$(${R_BIN} -s -e 'cat(parallel::detectCores())')
 echo "MAKEFLAGS=-j${ncores}" >> ${rhome}/etc/Renviron.site
 
-${R_BIN} CMD INSTALL ${INSTALL_ARGS} .
+# build first so that any stray compiled files in r/src are ignored
+${R_BIN} CMD build .
+${R_BIN} CMD INSTALL ${INSTALL_ARGS} arrow*.tar.gz
+
 # But unset the env var so that it doesn't cause us to run extra dev tests
 unset ARROW_R_DEV
 
diff --git a/ci/scripts/r_valgrind.sh b/ci/scripts/r_valgrind.sh
index 772d8f44ed5..d88b38ca57d 100755
--- a/ci/scripts/r_valgrind.sh
+++ b/ci/scripts/r_valgrind.sh
@@ -24,8 +24,13 @@ source_dir=${1}/r
 
 export CMAKE_BUILD_TYPE=RelWithDebInfo
 
-${R_BIN} CMD INSTALL ${INSTALL_ARGS} ${source_dir}
-pushd ${source_dir}/tests
+pushd ${source_dir}
+
+# build first so that any stray compiled files in r/src are ignored
+${R_BIN} CMD build .
+${R_BIN} CMD INSTALL ${INSTALL_ARGS} arrow*.tar.gz
+
+pushd tests
 
 # to generate suppression files run:
 # ${R_BIN} --vanilla -d "valgrind --tool=memcheck --leak-check=full --track-origins=yes --gen-suppressions=all --log-file=memcheck.log" -f testtthat.supp
@@ -44,3 +49,5 @@ fi
 # https://github.com/microsoft/LightGBM/blob/fa6d356555f9ef888acf5f5e259dca958ca24f6d/.ci/test_r_package_valgrind.sh#L20-L85
 
 popd
+
+popd

From 450f251d84a7f5d7223edcd2c0e9b90e9bf0006c Mon Sep 17 00:00:00 2001
From: Jonathan Keane <jkeane@gmail.com>
Date: Mon, 13 Dec 2021 16:53:33 -0600
Subject: [PATCH 2/3] set arrow source home

---
 dev/tasks/tasks.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 44fb2dcb946..3626f969824 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -1134,6 +1134,7 @@ tasks:
       env:
         ARROW_R_DEV: "TRUE"
         UBUNTU: 18.04
+        ARROW_SOURCE_HOME: "/arrow"
       image: ubuntu-r-valgrind
 
   test-r-linux-rchk:
@@ -1269,6 +1270,7 @@ tasks:
       env:
         UBUNTU: 18.04
         R_PRUNE_DEPS: TRUE
+        ARROW_SOURCE_HOME: "/arrow"
       image: ubuntu-r-sanitizer
 
   test-fedora-r-clang-sanitizer:
@@ -1277,6 +1279,7 @@ tasks:
     params:
       env:
         R_PRUNE_DEPS: TRUE
+        ARROW_SOURCE_HOME: "/arrow"
       image: fedora-r-clang-sanitizer
 
   revdep-r-check:

From 01b8dc76e8f88ae377e25a44f1e2dc2b20a340f5 Mon Sep 17 00:00:00 2001
From: Jonathan Keane <jkeane@gmail.com>
Date: Mon, 13 Dec 2021 17:16:04 -0600
Subject: [PATCH 3/3] oops wrong place

---
 dev/tasks/tasks.yml | 3 ---
 docker-compose.yml  | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 3626f969824..44fb2dcb946 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -1134,7 +1134,6 @@ tasks:
       env:
         ARROW_R_DEV: "TRUE"
         UBUNTU: 18.04
-        ARROW_SOURCE_HOME: "/arrow"
       image: ubuntu-r-valgrind
 
   test-r-linux-rchk:
@@ -1270,7 +1269,6 @@ tasks:
       env:
         UBUNTU: 18.04
         R_PRUNE_DEPS: TRUE
-        ARROW_SOURCE_HOME: "/arrow"
       image: ubuntu-r-sanitizer
 
   test-fedora-r-clang-sanitizer:
@@ -1279,7 +1277,6 @@ tasks:
     params:
       env:
         R_PRUNE_DEPS: TRUE
-        ARROW_SOURCE_HOME: "/arrow"
       image: fedora-r-clang-sanitizer
 
   revdep-r-check:
diff --git a/docker-compose.yml b/docker-compose.yml
index 834304dc7d4..5d2708e6250 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -176,7 +176,7 @@ volumes:
     name: python-wheel-windows-clcache
   ubuntu-ccache:
     name: ${ARCH}-ubuntu-${UBUNTU}-ccache
- 
+
 services:
 
   ################################# C++ #######################################
@@ -1226,6 +1226,7 @@ services:
         r_prune_deps: ${R_PRUNE_DEPS}
     environment:
       <<: *ccache
+      ARROW_SOURCE_HOME: "/arrow"
     volumes: *ubuntu-volumes
     command: >
       /bin/bash -c "
@@ -1287,6 +1288,7 @@ services:
       # AVX512 not supported by Valgrind (similar to ARROW-9851) some runners support AVX512 and some do not
       # so some build might pass without this setting, but we want to ensure that we stay to AVX2 regardless of runner.
       EXTRA_CMAKE_FLAGS: "-DARROW_RUNTIME_SIMD_LEVEL=AVX2"
+      ARROW_SOURCE_HOME: "/arrow"
     volumes: *ubuntu-volumes
     command: >
       /bin/bash -c "