From f28684d9f4dc76121fe1ec560851e4342d84048f Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 7 Jul 2023 09:31:43 +0900 Subject: [PATCH 1/8] GH-36456: [R] Remove system OpenSSL to avoid mixing OpenSSL versions --- dev/tasks/r/github.macos.autobrew.yml | 7 +++++-- dev/tasks/r/github.packages.yml | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dev/tasks/r/github.macos.autobrew.yml b/dev/tasks/r/github.macos.autobrew.yml index 28733dbfef1..6c16665c38d 100644 --- a/dev/tasks/r/github.macos.autobrew.yml +++ b/dev/tasks/r/github.macos.autobrew.yml @@ -39,6 +39,9 @@ jobs: run: | # minio and sccache are pre-installed on the self-hosted 10.13 runner if [ {{ '${{ matrix.platform }}' }} != macos-10.13 ]; then + # ensure removing OpenSSL to avoid mixing OpenSSL in the + # default path and OpenSSL installed by autobrew + brew uninstall openssl || : # install minio for tests brew install minio brew install sccache @@ -57,7 +60,7 @@ jobs: # between pre-installed R version on the self-hosted runners rig default {{ '${{ matrix.r-version }}' }} rig system setup-user-lib - rig system add-pak + rig system add-pak - uses: r-lib/actions/setup-r-dependencies@v2 with: working-directory: 'arrow/r' @@ -72,7 +75,7 @@ jobs: ARROW_USE_PKG_CONFIG: false ARROW_R_DEV: true FORCE_AUTOBREW: true - {{ macros.github_set_sccache_envvars()|indent(8)}} + {{ macros.github_set_sccache_envvars()|indent(8)}} run: arrow/ci/scripts/r_test.sh arrow - name: Dump install logs run: cat arrow/r/check/arrow.Rcheck/00install.out diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index e3e3d34e156..89ea6d0fee5 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -167,6 +167,10 @@ jobs: rig system setup-user-lib rig system add-pak + + # ensure removing OpenSSL to avoid mixing OpenSSL in the + # default path and OpenSSL installed by autobrew + brew uninstall openssl || : {{ macros.github_setup_local_r_repo(false, true)|indent }} - name: Prepare Dependency Installation From 20b1ba751e9202f107400a91281a9bd8120caeb5 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 7 Jul 2023 09:43:48 +0900 Subject: [PATCH 2/8] Use unlink --- dev/tasks/r/github.macos.autobrew.yml | 4 ++-- dev/tasks/r/github.packages.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/tasks/r/github.macos.autobrew.yml b/dev/tasks/r/github.macos.autobrew.yml index 6c16665c38d..f90c5ce977d 100644 --- a/dev/tasks/r/github.macos.autobrew.yml +++ b/dev/tasks/r/github.macos.autobrew.yml @@ -39,9 +39,9 @@ jobs: run: | # minio and sccache are pre-installed on the self-hosted 10.13 runner if [ {{ '${{ matrix.platform }}' }} != macos-10.13 ]; then - # ensure removing OpenSSL to avoid mixing OpenSSL in the + # ensure unlinking OpenSSL to avoid mixing OpenSSL in the # default path and OpenSSL installed by autobrew - brew uninstall openssl || : + brew unlink openssl || : # install minio for tests brew install minio brew install sccache diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index 89ea6d0fee5..721674dd7e8 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -168,9 +168,9 @@ jobs: rig system setup-user-lib rig system add-pak - # ensure removing OpenSSL to avoid mixing OpenSSL in the + # ensure unlinking OpenSSL to avoid mixing OpenSSL in the # default path and OpenSSL installed by autobrew - brew uninstall openssl || : + brew unlink openssl || : {{ macros.github_setup_local_r_repo(false, true)|indent }} - name: Prepare Dependency Installation From bf9bf449c1a458b0fb38c15b3122298e973b52f5 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 7 Jul 2023 10:51:48 +0900 Subject: [PATCH 3/8] find --- dev/tasks/r/github.macos.autobrew.yml | 1 + dev/tasks/r/github.packages.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/dev/tasks/r/github.macos.autobrew.yml b/dev/tasks/r/github.macos.autobrew.yml index f90c5ce977d..eb961eb73b6 100644 --- a/dev/tasks/r/github.macos.autobrew.yml +++ b/dev/tasks/r/github.macos.autobrew.yml @@ -42,6 +42,7 @@ jobs: # ensure unlinking OpenSSL to avoid mixing OpenSSL in the # default path and OpenSSL installed by autobrew brew unlink openssl || : + find / -name 'evp.h' # install minio for tests brew install minio brew install sccache diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index 721674dd7e8..92ab67a8137 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -171,6 +171,7 @@ jobs: # ensure unlinking OpenSSL to avoid mixing OpenSSL in the # default path and OpenSSL installed by autobrew brew unlink openssl || : + find / -name 'evp.h' {{ macros.github_setup_local_r_repo(false, true)|indent }} - name: Prepare Dependency Installation From 67f7d7dc5f75428af083f7857aca28bbb7bba0a3 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sun, 9 Jul 2023 16:15:06 +0900 Subject: [PATCH 4/8] Uninstall conda's OpenSSL --- dev/tasks/r/github.macos.autobrew.yml | 11 +++++++---- dev/tasks/r/github.packages.yml | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dev/tasks/r/github.macos.autobrew.yml b/dev/tasks/r/github.macos.autobrew.yml index eb961eb73b6..a8c745c40f4 100644 --- a/dev/tasks/r/github.macos.autobrew.yml +++ b/dev/tasks/r/github.macos.autobrew.yml @@ -39,14 +39,17 @@ jobs: run: | # minio and sccache are pre-installed on the self-hosted 10.13 runner if [ {{ '${{ matrix.platform }}' }} != macos-10.13 ]; then - # ensure unlinking OpenSSL to avoid mixing OpenSSL in the - # default path and OpenSSL installed by autobrew - brew unlink openssl || : - find / -name 'evp.h' # install minio for tests brew install minio brew install sccache fi + + # ensure removing OpenSSL from the default paths to avoid + # mixing OpenSSL in the default paths and OpenSSL installed + # by autobrew + brew unlink openssl || : + conda uninstall -y openssl || : + cd arrow/r {{ macros.pin_brew_formulae(is_fork)|indent }} - uses: r-lib/actions/setup-r@v2 diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index 92ab67a8137..cc2f6e96052 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -168,10 +168,10 @@ jobs: rig system setup-user-lib rig system add-pak - # ensure unlinking OpenSSL to avoid mixing OpenSSL in the - # default path and OpenSSL installed by autobrew + # ensure removing OpenSSL from the default paths to avoid + # mixing OpenSSL in the default paths and OpenSSL installed + # by autobrew brew unlink openssl || : - find / -name 'evp.h' {{ macros.github_setup_local_r_repo(false, true)|indent }} - name: Prepare Dependency Installation From a1e0265edf9e47f9f577625f5367fbb4e8c36e55 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 10 Jul 2023 06:30:54 +0900 Subject: [PATCH 5/8] Find --- dev/tasks/r/github.macos.autobrew.yml | 25 +++++++++++++------------ dev/tasks/r/github.packages.yml | 3 +++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dev/tasks/r/github.macos.autobrew.yml b/dev/tasks/r/github.macos.autobrew.yml index a8c745c40f4..dbb3c51d0e0 100644 --- a/dev/tasks/r/github.macos.autobrew.yml +++ b/dev/tasks/r/github.macos.autobrew.yml @@ -35,21 +35,20 @@ jobs: - "{{ macros.r_oldrel.ver }}" steps: {{ macros.github_checkout_arrow()|indent }} - - name: Configure autobrew script + - name: Setup hosted + if: matrix.platform != 'macos-10.13' run: | - # minio and sccache are pre-installed on the self-hosted 10.13 runner - if [ {{ '${{ matrix.platform }}' }} != macos-10.13 ]; then - # install minio for tests - brew install minio - brew install sccache - fi + # minio and sccache are pre-installed on the self-hosted 10.13 runner. + # Install minio for tests. + brew install minio + brew install sccache - # ensure removing OpenSSL from the default paths to avoid + # Ensure removing OpenSSL from the default paths to avoid # mixing OpenSSL in the default paths and OpenSSL installed - # by autobrew + # by autobrew. brew unlink openssl || : - conda uninstall -y openssl || : - + - name: Configure autobrew script + run: | cd arrow/r {{ macros.pin_brew_formulae(is_fork)|indent }} - uses: r-lib/actions/setup-r@v2 @@ -80,7 +79,9 @@ jobs: ARROW_R_DEV: true FORCE_AUTOBREW: true {{ macros.github_set_sccache_envvars()|indent(8)}} - run: arrow/ci/scripts/r_test.sh arrow + run: | + find / -name 'evp.h' || : + arrow/ci/scripts/r_test.sh arrow - name: Dump install logs run: cat arrow/r/check/arrow.Rcheck/00install.out if: always() diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index cc2f6e96052..62a8b441cfd 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -186,6 +186,9 @@ jobs: - name: Install sccache if: startsWith(matrix.platform, 'macos') run: brew install sccache + - name: Find + run: | + find / -name 'evp.h' || : - name: Build Binary id: build shell: Rscript {0} From 9ea58239e42adee031f57bb26df76165f3a2e336 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 10 Jul 2023 11:36:49 +0900 Subject: [PATCH 6/8] Find --- dev/tasks/r/github.macos.autobrew.yml | 2 +- dev/tasks/r/github.packages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/r/github.macos.autobrew.yml b/dev/tasks/r/github.macos.autobrew.yml index dbb3c51d0e0..4a8d34ac0d9 100644 --- a/dev/tasks/r/github.macos.autobrew.yml +++ b/dev/tasks/r/github.macos.autobrew.yml @@ -80,7 +80,7 @@ jobs: FORCE_AUTOBREW: true {{ macros.github_set_sccache_envvars()|indent(8)}} run: | - find / -name 'evp.h' || : + find / -name 'include/openssl' || : arrow/ci/scripts/r_test.sh arrow - name: Dump install logs run: cat arrow/r/check/arrow.Rcheck/00install.out diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index 62a8b441cfd..8fa56fb2750 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -188,7 +188,7 @@ jobs: run: brew install sccache - name: Find run: | - find / -name 'evp.h' || : + find / -name 'include/openssl' || : - name: Build Binary id: build shell: Rscript {0} From 42dd6231a2eca2dbe94f5b5fca14b72d3c7cc4e5 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 10 Jul 2023 13:43:00 +0900 Subject: [PATCH 7/8] grep --- dev/tasks/r/github.macos.autobrew.yml | 2 +- dev/tasks/r/github.packages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/r/github.macos.autobrew.yml b/dev/tasks/r/github.macos.autobrew.yml index 4a8d34ac0d9..e6045c2d990 100644 --- a/dev/tasks/r/github.macos.autobrew.yml +++ b/dev/tasks/r/github.macos.autobrew.yml @@ -80,7 +80,7 @@ jobs: FORCE_AUTOBREW: true {{ macros.github_set_sccache_envvars()|indent(8)}} run: | - find / -name 'include/openssl' || : + find / |& grep include/openssl || : arrow/ci/scripts/r_test.sh arrow - name: Dump install logs run: cat arrow/r/check/arrow.Rcheck/00install.out diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index 8fa56fb2750..ea5aff898d9 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -188,7 +188,7 @@ jobs: run: brew install sccache - name: Find run: | - find / -name 'include/openssl' || : + find / |& grep include/openssl || : - name: Build Binary id: build shell: Rscript {0} From e79c31e547544790451661715dfae482e24b0d74 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 10 Jul 2023 14:25:43 +0900 Subject: [PATCH 8/8] bash --- dev/tasks/r/github.macos.autobrew.yml | 2 +- dev/tasks/r/github.packages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/r/github.macos.autobrew.yml b/dev/tasks/r/github.macos.autobrew.yml index e6045c2d990..990a7dae403 100644 --- a/dev/tasks/r/github.macos.autobrew.yml +++ b/dev/tasks/r/github.macos.autobrew.yml @@ -80,7 +80,7 @@ jobs: FORCE_AUTOBREW: true {{ macros.github_set_sccache_envvars()|indent(8)}} run: | - find / |& grep include/openssl || : + find / 2>&1 | grep include/openssl || : arrow/ci/scripts/r_test.sh arrow - name: Dump install logs run: cat arrow/r/check/arrow.Rcheck/00install.out diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index ea5aff898d9..c9444f82ab5 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -188,7 +188,7 @@ jobs: run: brew install sccache - name: Find run: | - find / |& grep include/openssl || : + find / 2>&1 | grep include/openssl || : - name: Build Binary id: build shell: Rscript {0}