Skip to content

Commit

Permalink
apacheGH-38088: [R] Remove outdated references to brew and autobrew (a…
Browse files Browse the repository at this point in the history
…pache#38089)

### Rationale for this change

We no longer use autobrew to install on MacOS, so we no longer need CI jobs or helper scripts that had previously been referenced from this install path.

### What changes are included in this PR?

This PR removes references to autobrew that are no longer needed. It also removes the R homebrew CI job, which has been failing for several months. We had supported homebrew because `brew install apache-arrow --HEAD` was one method of avoiding a full binary install for potential MacOS contributors; however, downloading nightly static libraries (e.g., apache#38080) is an even faster way to get a compatible libarrow built for the R package and works on MacOS, Windows, and Linux.

### Are these changes tested?

These changes remove tests and infrastructure that are no longer relevant.

### Are there any user-facing changes?

No.
* Closes: apache#38088

Authored-by: Dewey Dunnington <dewey@voltrondata.com>
Signed-off-by: Jacob Wujciak-Jens <jacob@wujciak.de>
  • Loading branch information
paleolimbot authored and Jeremy Aguilon committed Oct 23, 2023
1 parent 6d92ab0 commit f4aacff
Show file tree
Hide file tree
Showing 17 changed files with 9 additions and 576 deletions.
13 changes: 0 additions & 13 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1889,19 +1889,6 @@ for PyArrow. Ibis is released under the Apache License, Version 2.0.

--------------------------------------------------------------------------------

This project includes code from the autobrew project.

The following files are based on code from the autobrew project:
* r/tools/autobrew
* dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb
* dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb

Copyright (c) 2019, Jeroen Ooms
License: MIT
Homepage: https://github.com/autobrew/

--------------------------------------------------------------------------------

dev/tasks/homebrew-formulae/apache-arrow.rb has the following license:

BSD 2-Clause License
Expand Down
7 changes: 0 additions & 7 deletions dev/release/01-prepare-test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,6 @@ def test_version_pre_tag
"+ url \"https://www.apache.org/dyn/closer.lua?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\""],
],
},
{
path: "dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb",
hunks: [
["- url \"https://www.apache.org/dyn/closer.lua?path=arrow/arrow-#{@previous_version}.9000/apache-arrow-#{@previous_version}.9000.tar.gz\"",
"+ url \"https://www.apache.org/dyn/closer.lua?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\""],
],
},
]
unless release_type == :patch
expected_changes += [
Expand Down
7 changes: 0 additions & 7 deletions dev/release/post-11-bump-versions-test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,6 @@ def test_version_post_tag
"+ url \"https://www.apache.org/dyn/closer.lua?path=arrow/arrow-#{@next_snapshot_version}/apache-arrow-#{@next_snapshot_version}.tar.gz\""],
],
},
{
path: "dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb",
hunks: [
["- url \"https://www.apache.org/dyn/closer.lua?path=arrow/arrow-#{@previous_version}.9000/apache-arrow-#{@previous_version}.9000.tar.gz\"",
"+ url \"https://www.apache.org/dyn/closer.lua?path=arrow/arrow-#{@release_version}.9000/apache-arrow-#{@release_version}.9000.tar.gz\""],
],
},
]
unless release_type == :patch
expected_changes += [
Expand Down
5 changes: 0 additions & 5 deletions dev/release/utils-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ update_versions() {
popd

pushd "${ARROW_DIR}/dev/tasks/homebrew-formulae"
sed -i.bak -E -e \
"s/arrow-[0-9.]+[0-9]+/arrow-${r_version}/g" \
autobrew/apache-arrow.rb
rm -f autobrew/apache-arrow.rb.bak
git add autobrew/apache-arrow.rb
sed -i.bak -E -e \
"s/arrow-[0-9.\-]+[0-9SNAPHOT]+/arrow-${version}/g" \
apache-arrow-glib.rb \
Expand Down
2 changes: 0 additions & 2 deletions dev/tasks/conda-recipes/r-arrow/build.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash
set -ex

export DISABLE_AUTOBREW=1

# arrow uses C++17
export ARROW_R_CXXFLAGS="${ARROW_R_CXXFLAGS} -std=c++17"
export LIBARROW_BUILD=false
Expand Down
99 changes: 0 additions & 99 deletions dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb

This file was deleted.

92 changes: 0 additions & 92 deletions dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb

This file was deleted.

22 changes: 2 additions & 20 deletions dev/tasks/macros.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -256,22 +256,6 @@ on:
done
{% endmacro %}

{%- macro pin_brew_formulae(is_fork = false) -%}
{#- This macro expects the cwd to be arrow/r -#}
# Copy all *brew formulae
cp ../dev/tasks/homebrew-formulae/autobrew/apache-arrow*.rb tools/

# Pin the git commit in the formula to match
pushd tools
if [ "{{ is_fork }}" == "true" ]; then
sed -i.bak -E -e 's/apache\/arrow.git", branch: "main"$/{{ arrow.github_repo.split("/") | join("\/") }}.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb
else
sed -i.bak -E -e 's/arrow.git", branch: "main"$/arrow.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb
fi
rm -f apache-arrow*.rb.bak
popd
{% endmacro %}

{%- macro github_change_r_pkg_version(is_fork, version) -%}
- name: Modify version
shell: bash
Expand All @@ -282,8 +266,6 @@ on:
DESCRIPTION
head DESCRIPTION
rm -f DESCRIPTION.bak

{{ pin_brew_formulae(is_fork) }}
{% endmacro %}

{%- macro github_test_r_src_pkg() -%}
Expand Down Expand Up @@ -392,7 +374,7 @@ on:
"AWS_SECRET_ACCESS_KEY": '${{ secrets.AWS_SECRET_ACCESS_KEY }}',
"SCCACHE_BUCKET": '${{ secrets.SCCACHE_BUCKET }}',
"SCCACHE_REGION": '${{ secrets.SCCACHE_REGION }}',
"SCCACHE_S3_KEY_PREFIX": sccache_key_prefix
"SCCACHE_S3_KEY_PREFIX": sccache_key_prefix
}
%}
{% for key, value in sccache_vars.items() %}
Expand All @@ -406,7 +388,7 @@ on:
"AWS_SECRET_ACCESS_KEY": '$(AWS_SECRET_ACCESS_KEY)',
"SCCACHE_BUCKET": '$(SCCACHE_BUCKET)',
"SCCACHE_REGION": '$(SCCACHE_REGION)',
"SCCACHE_S3_KEY_PREFIX": sccache_key_prefix
"SCCACHE_S3_KEY_PREFIX": sccache_key_prefix
}
%}
{% for key, value in sccache_vars.items() %}
Expand Down
6 changes: 3 additions & 3 deletions dev/tasks/r/github.macos-linux.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{{ macros.github_header() }}

jobs:
autobrew:
local:
name: "install from local source"
runs-on: {{ "${{ matrix.os }}" }}
{% if env is defined %}
Expand All @@ -37,14 +37,14 @@ jobs:
steps:
{{ macros.github_checkout_arrow()|indent }}

- name: Configure non-autobrew dependencies (macos)
- name: Configure dependencies (macos)
if: contains(matrix.os, 'macOS')
run: |
brew install openssl
# disable sccache on macos as it timesout for unknown reasons
# see GH-33721
# brew install sccache
- name: Configure non-autobrew dependencies (linux)
- name: Configure dependencies (linux)
if: contains(matrix.os, 'ubuntu')
run: |
sudo env \
Expand Down
Loading

0 comments on commit f4aacff

Please sign in to comment.