From 163c67a9dba6a4aa942baef8c4b7c2491a75fa80 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 11 Sep 2019 13:54:20 -0700 Subject: [PATCH 01/17] Add homebrew formula and crossbow nightly task --- ci/apache-arrow.rb | 82 +++++++++++++++++++++++++++++++++++ dev/tasks/tasks.yml | 8 ++++ dev/tasks/travis.homebrew.yml | 41 ++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 ci/apache-arrow.rb create mode 100644 dev/tasks/travis.homebrew.yml diff --git a/ci/apache-arrow.rb b/ci/apache-arrow.rb new file mode 100644 index 00000000000..d93e98b650e --- /dev/null +++ b/ci/apache-arrow.rb @@ -0,0 +1,82 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +class ApacheArrow < Formula + desc "Columnar in-memory analytics layer designed to accelerate big data" + homepage "https://arrow.apache.org/" + url "https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-0.14.1/apache-arrow-0.14.1.tar.gz" + sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28" + head "https://github.com/apache/arrow.git" + + bottle do + cellar :any + sha256 "cb9b62e236c4d138c3ad06671818c0f1a81ddd97bb5ef9fecc8c449d5f8aee86" => :mojave + sha256 "8afda2fb6023553c4c4e2ba4ad3a87e9411e2283905fd3fca0ec7e4ddb3cf612" => :high_sierra + sha256 "b5d11576669485b771d2fab149d499b41ec9d0fcda55d7f4ec98716e1e2f5c08" => :sierra + end + + depends_on "autoconf" => :build + depends_on "cmake" => :build + depends_on "boost" + depends_on "brotli" + depends_on "double-conversion" + depends_on "flatbuffers" + depends_on "glog" + depends_on "grpc" + depends_on "lz4" + depends_on "numpy" + depends_on "openssl" + depends_on "protobuf" + depends_on "python" + depends_on "rapidjson" + depends_on "snappy" + depends_on "thrift" + depends_on "zstd" + + def install + ENV.cxx11 + args = %W[ + -DARROW_FLIGHT=ON + -DARROW_ORC=ON + -DARROW_PARQUET=ON + -DARROW_PLASMA=ON + -DARROW_PROTOBUF_USE_SHARED=ON + -DARROW_PYTHON=ON + -DARROW_INSTALL_NAME_RPATH=OFF + -DPYTHON_EXECUTABLE=#{Formula["python"].bin/"python3"} + ] + + mkdir "build" + cd "build" do + system "cmake", "../cpp", *std_cmake_args, *args + system "make" + system "make", "install" + end + end + + test do + (testpath/"test.cpp").write <<~EOS + #include "arrow/api.h" + int main(void) { + arrow::int64(); + return 0; + } + EOS + system ENV.cxx, "test.cpp", "-std=c++11", "-I#{include}", "-L#{lib}", "-larrow", "-o", "test" + system "./test" + end +end diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 0c1ea9b1ffe..2a21a96465c 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -161,6 +161,7 @@ groups: - ubuntu-disco-arm64 - centos-6 - centos-7 + - homebrew-formula - gandiva-jar-trusty - gandiva-jar-osx - docker-r @@ -1085,6 +1086,13 @@ tasks: - plasma-glib-libs-{no_rc_version}-1.el7.x86_64.rpm - plasma-libs-{no_rc_version}-1.el7.x86_64.rpm + ############################## Homebrew Tasks ################################ + + homebrew-formula: + ci: travis + platform: osx + template: travis.homebrew.yml + ############################## Gandiva Tasks ################################ gandiva-jar-trusty: diff --git a/dev/tasks/travis.homebrew.yml b/dev/tasks/travis.homebrew.yml new file mode 100644 index 00000000000..9ddfd877c68 --- /dev/null +++ b/dev/tasks/travis.homebrew.yml @@ -0,0 +1,41 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +os: osx +language: ruby +cache: bundler + +# don't build twice +if: tag IS blank + +env: + global: + - TRAVIS_TAG={{ task.tag }} + - ARROW_FORMULA=./arrow/ci/apache-arrow.rb + +before_script: +- git clone --no-checkout {{ arrow.remote }} arrow +- git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} +- if [ $CROSSBOW_USE_COMMIT_ID == true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi +- brew update +- brew audit $ARROW_FORMULA +script: +- brew install -v --build-from-source --HEAD $ARROW_FORMULA +- brew test $ARROW_FORMULA + +notifications: + email: + - {{ job.email }} From 262c2415b7287839e9ec81397f9f0557c12509de Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 12 Sep 2019 13:33:49 -0700 Subject: [PATCH 02/17] Rename homebrew task yml; add to LICENSE --- LICENSE.txt | 30 +++++++++++++++++++ .../travis.osx.yml} | 0 dev/tasks/tasks.yml | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) rename dev/tasks/{travis.homebrew.yml => homebrew-formulae/travis.osx.yml} (100%) diff --git a/LICENSE.txt b/LICENSE.txt index 2280d5804f8..3207c2d0cd7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1844,3 +1844,33 @@ This project includes code from the autobrew project. Copyright: Copyright (c) 2017 - 2019, Jeroen Ooms. All rights reserved. Homepage: https://github.com/jeroen/autobrew + +-------------------------------------------------------------------------------- + +The files under dev/tasks/homebrew-formulae have the following license: + +BSD 2-Clause License + +Copyright (c) 2009-present, Homebrew contributors +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/dev/tasks/travis.homebrew.yml b/dev/tasks/homebrew-formulae/travis.osx.yml similarity index 100% rename from dev/tasks/travis.homebrew.yml rename to dev/tasks/homebrew-formulae/travis.osx.yml diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 2a21a96465c..1cdb05228eb 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1091,7 +1091,7 @@ tasks: homebrew-formula: ci: travis platform: osx - template: travis.homebrew.yml + template: homebrew-formulae/travis.osx.yml ############################## Gandiva Tasks ################################ From ea4368e49a81aad5d5851dafc5bd7b2479e941bb Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 12 Sep 2019 13:43:25 -0700 Subject: [PATCH 03/17] Re-alphabetize the seds in 00-prepare.sh --- dev/release/00-prepare.sh | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 34989fb7758..105de6ba1d8 100755 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -42,14 +42,6 @@ update_versions() { ;; esac - cd "${SOURCE_DIR}/../../cpp" - sed -i.bak -E -e \ - "s/^set\(ARROW_VERSION \".+\"\)/set(ARROW_VERSION \"${version}\")/" \ - CMakeLists.txt - rm -f CMakeLists.txt.bak - git add CMakeLists.txt - cd - - cd "${SOURCE_DIR}/../../c_glib" sed -i.bak -E -e \ "s/^m4_define\(\[arrow_glib_version\], .+\)/m4_define([arrow_glib_version], ${version})/" \ @@ -61,6 +53,22 @@ update_versions() { git add configure.ac meson.build cd - + cd "${SOURCE_DIR}/../../ci" + sed -i.bak -E -e \ + "s/^pkgver=.+/pkgver=${r_version}/" \ + PKGBUILD + rm -f PKGBUILD.bak + git add PKGBUILD + cd - + + cd "${SOURCE_DIR}/../../cpp" + sed -i.bak -E -e \ + "s/^set\(ARROW_VERSION \".+\"\)/set(ARROW_VERSION \"${version}\")/" \ + CMakeLists.txt + rm -f CMakeLists.txt.bak + git add CMakeLists.txt + cd - + cd "${SOURCE_DIR}/../../csharp" sed -i.bak -E -e \ "s/^ .+<\/Version>/ ${version}<\/Version>/" \ @@ -99,17 +107,6 @@ update_versions() { DESCRIPTION rm -f DESCRIPTION.bak git add DESCRIPTION - cd - - - cd "${SOURCE_DIR}/../../ci" - sed -i.bak -E -e \ - "s/^pkgver=.+/pkgver=${r_version}/" \ - PKGBUILD - rm -f PKGBUILD.bak - git add PKGBUILD - cd - - - cd "${SOURCE_DIR}/../../r" if [ ${type} = "snapshot" ]; then # Add a news entry for the new dev version echo "dev" From 40fc370c68854758e94a0611539a1e1e58195360 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 12 Sep 2019 14:15:50 -0700 Subject: [PATCH 04/17] Attempt to set the homebrew formula arrow version in the release script --- dev/release/00-prepare-test.rb | 7 +++++++ dev/release/00-prepare.sh | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index 77a048a372c..d14bf6d97d0 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -92,6 +92,13 @@ def test_update_version_pre_tag "+pkgver=#{@release_version}"], ], }, + { + path: "ci/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\""], + ], + }, { path: "cpp/CMakeLists.txt", hunks: [ diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 105de6ba1d8..3347dafc0b8 100755 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -59,6 +59,11 @@ update_versions() { PKGBUILD rm -f PKGBUILD.bak git add PKGBUILD + sed -i.bak -E -e \ + "s/^ url .+(arrow-[0-9.]+[0-9]+)/arrow-${r_version}/g" \ + apache-arrow.rb + rm -f apache-arrow.rb.bak + git add apache-arrow.rb cd - cd "${SOURCE_DIR}/../../cpp" From 34af2a91122898b40454774d5da227351f53b6d1 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 12 Sep 2019 14:29:33 -0700 Subject: [PATCH 05/17] Add missing test assertion --- dev/release/00-prepare-test.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index d14bf6d97d0..7671da1b89e 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -255,6 +255,13 @@ def test_update_version_post_tag "+pkgver=#{@release_version}.9000"], ], }, + { + path: "ci/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\""], + ], + }, { path: "cpp/CMakeLists.txt", hunks: [ From 6d00fe444d72684b15cc53b9ad86dfc84420578f Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 12 Sep 2019 15:44:02 -0700 Subject: [PATCH 06/17] Fix regular expression --- dev/release/00-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 3347dafc0b8..16747d1f847 100755 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -60,7 +60,7 @@ update_versions() { rm -f PKGBUILD.bak git add PKGBUILD sed -i.bak -E -e \ - "s/^ url .+(arrow-[0-9.]+[0-9]+)/arrow-${r_version}/g" \ + "s/arrow-[0-9.]+[0-9]+/arrow-${r_version}/g" \ apache-arrow.rb rm -f apache-arrow.rb.bak git add apache-arrow.rb From a133385c126e9f033ef5fdd1dacbf16253c0d222 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 12 Sep 2019 15:52:58 -0700 Subject: [PATCH 07/17] Fix test (hopefully?) --- ci/apache-arrow.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/apache-arrow.rb b/ci/apache-arrow.rb index d93e98b650e..90961d7f33a 100644 --- a/ci/apache-arrow.rb +++ b/ci/apache-arrow.rb @@ -18,7 +18,7 @@ class ApacheArrow < Formula desc "Columnar in-memory analytics layer designed to accelerate big data" homepage "https://arrow.apache.org/" - url "https://www.apache.org/dyn/closer.cgi?path=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" From d61290a874b840a5448dda1ac6293e8e74ec2041 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Fri, 13 Sep 2019 11:16:41 -0700 Subject: [PATCH 08/17] Remove bottle shas --- ci/apache-arrow.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ci/apache-arrow.rb b/ci/apache-arrow.rb index 90961d7f33a..6ab9c5e638c 100644 --- a/ci/apache-arrow.rb +++ b/ci/apache-arrow.rb @@ -22,13 +22,6 @@ class ApacheArrow < Formula sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28" head "https://github.com/apache/arrow.git" - bottle do - cellar :any - sha256 "cb9b62e236c4d138c3ad06671818c0f1a81ddd97bb5ef9fecc8c449d5f8aee86" => :mojave - sha256 "8afda2fb6023553c4c4e2ba4ad3a87e9411e2283905fd3fca0ec7e4ddb3cf612" => :high_sierra - sha256 "b5d11576669485b771d2fab149d499b41ec9d0fcda55d7f4ec98716e1e2f5c08" => :sierra - end - depends_on "autoconf" => :build depends_on "cmake" => :build depends_on "boost" From 89dea4ff094b230affe54be292503cc803dfdfe4 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Tue, 17 Sep 2019 13:20:34 -0700 Subject: [PATCH 09/17] Parametrize homebrew task and also test 'autobrew' --- dev/tasks/homebrew-formulae/travis.osx.yml | 2 +- dev/tasks/tasks.yml | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dev/tasks/homebrew-formulae/travis.osx.yml b/dev/tasks/homebrew-formulae/travis.osx.yml index 9ddfd877c68..1b13395d849 100644 --- a/dev/tasks/homebrew-formulae/travis.osx.yml +++ b/dev/tasks/homebrew-formulae/travis.osx.yml @@ -24,7 +24,7 @@ if: tag IS blank env: global: - TRAVIS_TAG={{ task.tag }} - - ARROW_FORMULA=./arrow/ci/apache-arrow.rb + - ARROW_FORMULA=./arrow/{{ formula }} before_script: - git clone --no-checkout {{ arrow.remote }} arrow diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 1cdb05228eb..078dbdf70da 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -161,7 +161,8 @@ groups: - ubuntu-disco-arm64 - centos-6 - centos-7 - - homebrew-formula + - homebrew-cpp + - homebrew-cpp-autobrew - gandiva-jar-trusty - gandiva-jar-osx - docker-r @@ -1088,10 +1089,19 @@ tasks: ############################## Homebrew Tasks ################################ - homebrew-formula: + homebrew-cpp: ci: travis platform: osx template: homebrew-formulae/travis.osx.yml + params: + formula: ci/apache-arrow.rb + + homebrew-cpp-autobrew: + ci: travis + platform: osx + template: homebrew-formulae/travis.osx.yml + params: + formula: r/tools/apache-arrow.rb ############################## Gandiva Tasks ################################ From b25ac6de60af6e3861c14910799954378c6ffa50 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Tue, 17 Sep 2019 13:24:28 -0700 Subject: [PATCH 10/17] Fix licensing/:rat: for ci/apache-arrow.rb --- LICENSE.txt | 2 +- ci/apache-arrow.rb | 17 ----------------- dev/release/rat_exclude_files.txt | 1 + 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 3207c2d0cd7..135b057d99a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1847,7 +1847,7 @@ Homepage: https://github.com/jeroen/autobrew -------------------------------------------------------------------------------- -The files under dev/tasks/homebrew-formulae have the following license: +ci/apache-arrow.rb has the following license: BSD 2-Clause License diff --git a/ci/apache-arrow.rb b/ci/apache-arrow.rb index 6ab9c5e638c..50075b3eab2 100644 --- a/ci/apache-arrow.rb +++ b/ci/apache-arrow.rb @@ -1,20 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - class ApacheArrow < Formula desc "Columnar in-memory analytics layer designed to accelerate big data" homepage "https://arrow.apache.org/" diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt index 8ba64d19217..4af96ee3043 100644 --- a/dev/release/rat_exclude_files.txt +++ b/dev/release/rat_exclude_files.txt @@ -8,6 +8,7 @@ *.json *.snap .github/ISSUE_TEMPLATE.md +ci/apache-arrow.rb cpp/CHANGELOG_PARQUET.md cpp/src/arrow/io/mman.h cpp/src/arrow/util/random.h From 8816279b4d1fd7aeb3a448631c1be4f3a912891f Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Tue, 17 Sep 2019 15:11:50 -0700 Subject: [PATCH 11/17] Fix autobrew audit check [skip ci] --- r/tools/apache-arrow.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r/tools/apache-arrow.rb b/r/tools/apache-arrow.rb index 8f942b02d64..6be0dda7a07 100644 --- a/r/tools/apache-arrow.rb +++ b/r/tools/apache-arrow.rb @@ -31,11 +31,11 @@ class ApacheArrow < Formula depends_on "cmake" => :build depends_on "flatbuffers" => :build - depends_on "double-conversion" depends_on "boost" + depends_on "double-conversion" depends_on "lz4" - depends_on "thrift" depends_on "snappy" + depends_on "thrift" def install ENV.cxx11 From 79e9191f07ac016cfefdb9c6964dd91424e45f82 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 18 Sep 2019 14:51:24 -0700 Subject: [PATCH 12/17] Remove autoconf from homebrew formula because new jemalloc no longer requires it --- ci/apache-arrow.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/apache-arrow.rb b/ci/apache-arrow.rb index 50075b3eab2..84e993680fc 100644 --- a/ci/apache-arrow.rb +++ b/ci/apache-arrow.rb @@ -5,7 +5,6 @@ class ApacheArrow < Formula sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28" head "https://github.com/apache/arrow.git" - depends_on "autoconf" => :build depends_on "cmake" => :build depends_on "boost" depends_on "brotli" From ff1489ea797cfbe745df907d62c562340231e5b4 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Fri, 20 Sep 2019 09:25:10 -0700 Subject: [PATCH 13/17] Use regular snapshot version for homebrew formula --- ci/apache-arrow.rb | 2 +- dev/release/00-prepare-test.rb | 4 ++-- dev/release/00-prepare.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/apache-arrow.rb b/ci/apache-arrow.rb index 84e993680fc..8f08f96df65 100644 --- a/ci/apache-arrow.rb +++ b/ci/apache-arrow.rb @@ -1,7 +1,7 @@ class ApacheArrow < Formula desc "Columnar in-memory analytics layer designed to accelerate big data" homepage "https://arrow.apache.org/" - url "https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-0.14.1.9000/apache-arrow-0.14.1.9000.tar.gz" + url "https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-0.15.0-SNAPSHOT/apache-arrow-0.15.0-SNAPSHOT.tar.gz" sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28" head "https://github.com/apache/arrow.git" diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index 7671da1b89e..8b6c234f4e6 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -95,7 +95,7 @@ def test_update_version_pre_tag { path: "ci/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-#{@snapshot_version}/apache-arrow-#{@snapshot_version}.tar.gz\"", "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\""], ], }, @@ -259,7 +259,7 @@ def test_update_version_post_tag path: "ci/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\""], + "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@next_snapshot_version}/apache-arrow-#{@next_snapshot_version}.tar.gz\""], ], }, { diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 16747d1f847..330d6248bb8 100755 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -60,7 +60,7 @@ update_versions() { rm -f PKGBUILD.bak git add PKGBUILD sed -i.bak -E -e \ - "s/arrow-[0-9.]+[0-9]+/arrow-${r_version}/g" \ + "s/arrow-[0-9.\-]+[0-9SNAPHOT]+/arrow-${version}/g" \ apache-arrow.rb rm -f apache-arrow.rb.bak git add apache-arrow.rb From 1d6512b2afd5da18727cbfd876ab736fc576e7b8 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Fri, 20 Sep 2019 14:17:55 -0700 Subject: [PATCH 14/17] Move homebrew formulae inside dev/tasks. Update autobrew package version in release script --- LICENSE.txt | 6 +-- dev/release/00-prepare-test.rb | 42 ++++++++++++------- dev/release/00-prepare.sh | 18 +++++--- dev/release/rat_exclude_files.txt | 2 +- .../apache-arrow-autobrew.rb | 0 .../tasks/homebrew-formulae}/apache-arrow.rb | 0 dev/tasks/homebrew-formulae/travis.osx.yml | 2 +- dev/tasks/tasks.yml | 4 +- r/configure | 6 ++- 9 files changed, 52 insertions(+), 28 deletions(-) rename r/tools/apache-arrow.rb => dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb (100%) rename {ci => dev/tasks/homebrew-formulae}/apache-arrow.rb (100%) diff --git a/LICENSE.txt b/LICENSE.txt index 135b057d99a..a75b9c4e5d2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1838,8 +1838,8 @@ for PyArrow. Ibis is released under the Apache License, Version 2.0. This project includes code from the autobrew project. -* r/tools/autobrew and r/tools/apache-arrow.rb are based on code - from the autobrew project. +* r/tools/autobrew and dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb + are based on code from the autobrew project. Copyright: Copyright (c) 2017 - 2019, Jeroen Ooms. All rights reserved. @@ -1847,7 +1847,7 @@ Homepage: https://github.com/jeroen/autobrew -------------------------------------------------------------------------------- -ci/apache-arrow.rb has the following license: +dev/tasks/homebrew-formulae/apache-arrow.rb has the following license: BSD 2-Clause License diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index 8b6c234f4e6..398817406bc 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -92,13 +92,6 @@ def test_update_version_pre_tag "+pkgver=#{@release_version}"], ], }, - { - path: "ci/apache-arrow.rb", - hunks: [ - ["- url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@snapshot_version}/apache-arrow-#{@snapshot_version}.tar.gz\"", - "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\""], - ], - }, { path: "cpp/CMakeLists.txt", hunks: [ @@ -113,6 +106,20 @@ def test_update_version_pre_tag "+ #{@release_version}"], ], }, + { + path: "dev/tasks/homebrew-formulae/apache-arrow.rb", + hunks: [ + ["- url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@snapshot_version}/apache-arrow-#{@snapshot_version}.tar.gz\"", + "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\""], + ], + }, + { + path: "dev/tasks/homebrew-formulae/apache-arrow-autobrew.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\""], + ], + }, { path: "js/package.json", hunks: [ @@ -255,13 +262,6 @@ def test_update_version_post_tag "+pkgver=#{@release_version}.9000"], ], }, - { - path: "ci/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-#{@next_snapshot_version}/apache-arrow-#{@next_snapshot_version}.tar.gz\""], - ], - }, { path: "cpp/CMakeLists.txt", hunks: [ @@ -276,6 +276,20 @@ def test_update_version_post_tag "+ #{@next_snapshot_version}"], ], }, + { + path: "dev/tasks/homebrew-formulae/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-#{@next_snapshot_version}/apache-arrow-#{@next_snapshot_version}.tar.gz\""], + ], + }, + { + path: "dev/tasks/homebrew-formulae/apache-arrow-autobrew.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\""], + ], + }, { path: "js/package.json", hunks: [ diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 330d6248bb8..7567d56a576 100755 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -59,11 +59,6 @@ update_versions() { PKGBUILD rm -f PKGBUILD.bak git add PKGBUILD - sed -i.bak -E -e \ - "s/arrow-[0-9.\-]+[0-9SNAPHOT]+/arrow-${version}/g" \ - apache-arrow.rb - rm -f apache-arrow.rb.bak - git add apache-arrow.rb cd - cd "${SOURCE_DIR}/../../cpp" @@ -82,6 +77,19 @@ update_versions() { git add Directory.Build.props cd - + cd "${SOURCE_DIR}/../../dev/tasks/homebrew-formulae" + sed -i.bak -E -e \ + "s/arrow-[0-9.\-]+[0-9SNAPHOT]+/arrow-${version}/g" \ + apache-arrow.rb + rm -f apache-arrow.rb.bak + git add apache-arrow.rb + 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 + cd - + cd "${SOURCE_DIR}/../../js" sed -i.bak -E -e \ "s/^ \"version\": \".+\"/ \"version\": \"${version}\"/" \ diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt index 4af96ee3043..62ce9d76b13 100644 --- a/dev/release/rat_exclude_files.txt +++ b/dev/release/rat_exclude_files.txt @@ -8,7 +8,6 @@ *.json *.snap .github/ISSUE_TEMPLATE.md -ci/apache-arrow.rb cpp/CHANGELOG_PARQUET.md cpp/src/arrow/io/mman.h cpp/src/arrow/util/random.h @@ -33,6 +32,7 @@ cpp/src/plasma/thirdparty/ae/config.h cpp/src/plasma/thirdparty/ae/zmalloc.h cpp/src/plasma/thirdparty/dlmalloc.c dev/release/rat_exclude_files.txt +dev/tasks/homebrew-formulae/apache-arrow.rb dev/tasks/linux-packages/debian.ubuntu-xenial/compat dev/tasks/linux-packages/debian.ubuntu-xenial/control dev/tasks/linux-packages/debian.ubuntu-xenial/gir1.2-arrow-1.0.install diff --git a/r/tools/apache-arrow.rb b/dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb similarity index 100% rename from r/tools/apache-arrow.rb rename to dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb diff --git a/ci/apache-arrow.rb b/dev/tasks/homebrew-formulae/apache-arrow.rb similarity index 100% rename from ci/apache-arrow.rb rename to dev/tasks/homebrew-formulae/apache-arrow.rb diff --git a/dev/tasks/homebrew-formulae/travis.osx.yml b/dev/tasks/homebrew-formulae/travis.osx.yml index 1b13395d849..8b23d7c767a 100644 --- a/dev/tasks/homebrew-formulae/travis.osx.yml +++ b/dev/tasks/homebrew-formulae/travis.osx.yml @@ -24,7 +24,7 @@ if: tag IS blank env: global: - TRAVIS_TAG={{ task.tag }} - - ARROW_FORMULA=./arrow/{{ formula }} + - ARROW_FORMULA=./arrow/dev/tasks/homebrew-formulae/{{ formula }} before_script: - git clone --no-checkout {{ arrow.remote }} arrow diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 078dbdf70da..082e09aff3e 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1094,14 +1094,14 @@ tasks: platform: osx template: homebrew-formulae/travis.osx.yml params: - formula: ci/apache-arrow.rb + formula: apache-arrow.rb homebrew-cpp-autobrew: ci: travis platform: osx template: homebrew-formulae/travis.osx.yml params: - formula: r/tools/apache-arrow.rb + formula: apache-arrow-autobrew.rb ############################## Gandiva Tasks ################################ diff --git a/r/configure b/r/configure index 6efaf157114..5ec38542cd5 100755 --- a/r/configure +++ b/r/configure @@ -40,10 +40,12 @@ if [ "$ARROW_R_DEV" == "TRUE" ]; then fi if [ "$LOCAL_AUTOBREW" == "TRUE" ]; then - # LOCAL_AUTOBREW means use the formula in tools/ + # 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 + # (assuming a local checkout of the apache/arrow repository) # FORCE_AUTOBREW without LOCAL_AUTOBREW means to pull from jeroen.github.io cp tools/autobrew . - cp tools/apache-arrow.rb . FORCE_AUTOBREW="TRUE" fi From 851ac6eae7617b951f046da5b78d6c8df98f7b0d Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Fri, 20 Sep 2019 14:43:15 -0700 Subject: [PATCH 15/17] Sort hunks :muscle: --- dev/release/00-prepare-test.rb | 16 ++++++++-------- dev/release/00-prepare.sh | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index 398817406bc..b170294663a 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -107,16 +107,16 @@ def test_update_version_pre_tag ], }, { - path: "dev/tasks/homebrew-formulae/apache-arrow.rb", + path: "dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb", hunks: [ - ["- url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@snapshot_version}/apache-arrow-#{@snapshot_version}.tar.gz\"", + ["- 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\""], ], }, { - path: "dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb", + path: "dev/tasks/homebrew-formulae/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-#{@snapshot_version}/apache-arrow-#{@snapshot_version}.tar.gz\"", "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\""], ], }, @@ -277,17 +277,17 @@ def test_update_version_post_tag ], }, { - path: "dev/tasks/homebrew-formulae/apache-arrow.rb", + path: "dev/tasks/homebrew-formulae/apache-arrow-autobrew.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-#{@next_snapshot_version}/apache-arrow-#{@next_snapshot_version}.tar.gz\""], + "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}.9000/apache-arrow-#{@release_version}.9000.tar.gz\""], ], }, { - path: "dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb", + path: "dev/tasks/homebrew-formulae/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\""], + "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@next_snapshot_version}/apache-arrow-#{@next_snapshot_version}.tar.gz\""], ], }, { diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 7567d56a576..f45573e137e 100755 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -78,16 +78,16 @@ update_versions() { cd - cd "${SOURCE_DIR}/../../dev/tasks/homebrew-formulae" - sed -i.bak -E -e \ - "s/arrow-[0-9.\-]+[0-9SNAPHOT]+/arrow-${version}/g" \ - apache-arrow.rb - rm -f apache-arrow.rb.bak - git add apache-arrow.rb 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 + sed -i.bak -E -e \ + "s/arrow-[0-9.\-]+[0-9SNAPHOT]+/arrow-${version}/g" \ + apache-arrow.rb + rm -f apache-arrow.rb.bak + git add apache-arrow.rb cd - cd "${SOURCE_DIR}/../../js" From ea3f9b5fc1d522f444ff5cab4c7b858877506e10 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Fri, 20 Sep 2019 15:20:19 -0700 Subject: [PATCH 16/17] Move autobrew script again and fix URL to match regular homebrew --- LICENSE.txt | 2 +- dev/release/00-prepare-test.rb | 4 ++-- dev/release/00-prepare.sh | 6 +++--- .../{apache-arrow-autobrew.rb => autobrew/apache-arrow.rb} | 2 +- dev/tasks/tasks.yml | 2 +- r/configure | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename dev/tasks/homebrew-formulae/{apache-arrow-autobrew.rb => autobrew/apache-arrow.rb} (95%) diff --git a/LICENSE.txt b/LICENSE.txt index a75b9c4e5d2..cb359c05720 100644 --- 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 index b170294663a..b0080b57fbf 100644 --- 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 index f45573e137e..8578f83b80f 100755 --- 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/dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb similarity index 95% rename from dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb rename to dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb index 6be0dda7a07..8e5000821ac 100644 --- a/dev/tasks/homebrew-formulae/apache-arrow-autobrew.rb +++ b/dev/tasks/homebrew-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 index 082e09aff3e..a6720f05a72 100644 --- 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 index 5ec38542cd5..123094ee2d9 100755 --- 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 . From 4a50a3779f352467d62166f4890c4f46c94421a3 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Fri, 20 Sep 2019 15:33:46 -0700 Subject: [PATCH 17/17] Shuffle again --- dev/release/00-prepare-test.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index b0080b57fbf..805983d467c 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -107,16 +107,16 @@ def test_update_version_pre_tag ], }, { - path: "dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb", + path: "dev/tasks/homebrew-formulae/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-#{@snapshot_version}/apache-arrow-#{@snapshot_version}.tar.gz\"", "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\""], ], }, { - path: "dev/tasks/homebrew-formulae/apache-arrow.rb", + path: "dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb", hunks: [ - ["- url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@snapshot_version}/apache-arrow-#{@snapshot_version}.tar.gz\"", + ["- 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,17 +277,17 @@ def test_update_version_post_tag ], }, { - path: "dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb", + path: "dev/tasks/homebrew-formulae/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\""], + "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@next_snapshot_version}/apache-arrow-#{@next_snapshot_version}.tar.gz\""], ], }, { - path: "dev/tasks/homebrew-formulae/apache-arrow.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-#{@next_snapshot_version}/apache-arrow-#{@next_snapshot_version}.tar.gz\""], + "+ url \"https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-#{@release_version}.9000/apache-arrow-#{@release_version}.9000.tar.gz\""], ], }, {