From e5b3bc28a60f519df36cc0a51b2c507be84acc4b Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Fri, 14 Jul 2023 10:37:30 -0300 Subject: [PATCH 1/2] fix branch --- dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb | 2 +- dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb index c0df6a32175eb..4586649d0c0bc 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb @@ -25,7 +25,7 @@ class ApacheArrowStatic < Formula # Uncomment and update to test on a release candidate # mirror "https://dist.apache.org/repos/dist/dev/arrow/apache-arrow-8.0.0-rc1/apache-arrow-8.0.0.tar.gz" sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28" - head "https://github.com/apache/arrow.git" + head "https://github.com/apache/arrow.git", branch: "main" bottle do sha256 cellar: :any, arm64_big_sur: "ef89d21a110b89840cc6148add685d407e75bd633bc8f79625eb33d00e3694b4" diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb index c09436d777ae9..a5194eea3f7d0 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb @@ -21,7 +21,7 @@ class ApacheArrow < Formula homepage "https://arrow.apache.org/" url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-12.0.1.9000/apache-arrow-12.0.1.9000.tar.gz" sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28" - head "https://github.com/apache/arrow.git" + head "https://github.com/apache/arrow.git", branch: "main" bottle do cellar :any From 437a91dd56a75220ef7b323b558e44ff8170a789 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Fri, 14 Jul 2023 11:04:28 -0300 Subject: [PATCH 2/2] fix instructions --- r/configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/configure b/r/configure index 198a89cd85e83..e0198773459f4 100755 --- a/r/configure +++ b/r/configure @@ -238,7 +238,7 @@ do_autobrew () { # Setup for local autobrew testing if [ -f "tools/apache-arrow.rb" ]; then # If you want to use a local apache-arrow.rb formula, do - # $ cp ../dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb tools/apache-arrow.rb + # $ cp ../dev/tasks/homebrew-formulae/autobrew/apache-arrow*.rb tools # before R CMD build or INSTALL (assuming a local checkout of the apache/arrow repository). # If you have this, you should use the local autobrew script so they match. cp tools/autobrew .