Skip to content

Commit

Permalink
apacheGH-36456: [R] Remove system OpenSSL to avoid mixing OpenSSL ver…
Browse files Browse the repository at this point in the history
…sions
  • Loading branch information
kou committed Jul 7, 2023
1 parent 6a57a08 commit f28684d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 5 additions & 2 deletions dev/tasks/r/github.macos.autobrew.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions dev/tasks/r/github.packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit f28684d

Please sign in to comment.