Move autobrew script again and fix URL to match regular homebrew

apache · Sep 20, 2019 · ea3f9b5 · ea3f9b5
1 parent 851ac6e
commit ea3f9b5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1838,7 +1838,7 @@ for PyArrow. Ibis is released under the Apache License, Version 2.0.
 
 This project includes code from the autobrew project.
 
-* r/tools/autobrew and dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb
+* r/tools/autobrew and dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb
   are based on code from the autobrew project.
 
 Copyright: Copyright (c) 2017 - 2019, Jeroen Ooms.

diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb
@@ -107,7 +107,7 @@ def test_update_version_pre_tag
                      ],
                    },
                    {
-                     path: "dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb",
+                     path: "dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb",
                      hunks: [
                        ["-  url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@previous_version}.9000/apache-arrow-#{@previous_version}.9000.tar.gz\"",
                         "+  url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\""],
@@ -277,7 +277,7 @@ def test_update_version_post_tag
                      ],
                    },
                    {
-                     path: "dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb",
+                     path: "dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb",
                      hunks: [
                        ["-  url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\"",
                         "+  url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}.9000/apache-arrow-#{@release_version}.9000.tar.gz\""],

diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh
@@ -80,9 +80,9 @@ update_versions() {
   cd "${SOURCE_DIR}/../../dev/tasks/homebrew-formulae"
   sed -i.bak -E -e \
     "s/arrow-[0-9.]+[0-9]+/arrow-${r_version}/g" \
-    apache-arrow-autobrew.rb
-  rm -f apache-arrow-autobrew.rb.bak
-  git add apache-arrow-autobrew.rb
+    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.rb

diff --git a/...omebrew-formulae/apache-arrow-autobrew.rb → ...omebrew-formulae/autobrew/apache-arrow.rb b/...omebrew-formulae/apache-arrow-autobrew.rb → ...omebrew-formulae/autobrew/apache-arrow.rb
@@ -19,7 +19,7 @@
 class ApacheArrow < Formula
   desc "Columnar in-memory analytics layer designed to accelerate big data"
   homepage "https://arrow.apache.org/"
-  url "https://archive.apache.org/dist/arrow/arrow-0.14.1/apache-arrow-0.14.1.tar.gz"
+  url "https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-0.14.1.9000/apache-arrow-0.14.1.9000.tar.gz"
   sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28"
   head "https://github.com/apache/arrow.git"
 

diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
@@ -1101,7 +1101,7 @@ tasks:
     platform: osx
     template: homebrew-formulae/travis.osx.yml
     params:
-      formula: apache-arrow-autobrew.rb
+      formula: autobrew/apache-arrow.rb
 
   ############################## Gandiva Tasks ################################
 

diff --git a/r/configure b/r/configure
@@ -42,7 +42,7 @@ fi
 if [ "$LOCAL_AUTOBREW" == "TRUE" ]; then
   # LOCAL_AUTOBREW means use the script in tools/
   # If you want to use a local apache-arrow.rb formula, do:
-  # $ cp ../dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb apache-arrow.rb
+  # $ cp ../dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb apache-arrow.rb
   # (assuming a local checkout of the apache/arrow repository)
   # FORCE_AUTOBREW without LOCAL_AUTOBREW means to pull from jeroen.github.io
   cp tools/autobrew .