You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by cp...@apache.org on 2018/07/31 01:15:55 UTC

[arrow] branch master updated: ARROW-2875: [Packaging] Don't attempt to download arrow archive in linux builds

This is an automated email from the ASF dual-hosted git repository.

cpcloud pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 4c0d49f  ARROW-2875: [Packaging] Don't attempt to download arrow archive in linux builds
4c0d49f is described below

commit 4c0d49f3feac4f1f190486935182242eebbbe045
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Mon Jul 30 21:15:43 2018 -0400

    ARROW-2875: [Packaging] Don't attempt to download arrow archive in linux builds
    
    Waiting for the [linux builds](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-238)...
    
    Author: Krisztián Szűcs <sz...@gmail.com>
    
    Closes #2288 from kszucs/ARROW-2875 and squashes the following commits:
    
    8fef43c5 <Krisztián Szűcs> pass arrow version explicitly
    3d6b90ca <Krisztián Szűcs> always build archive
---
 dev/tasks/crossbow.py             |  8 +++++++-
 dev/tasks/linux-packages/Rakefile | 17 +++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dev/tasks/crossbow.py b/dev/tasks/crossbow.py
index 2423237..5e4c42c 100755
--- a/dev/tasks/crossbow.py
+++ b/dev/tasks/crossbow.py
@@ -446,14 +446,20 @@ def load_tasks_from_config(config_path, task_names, group_names):
 @click.option('--config-path', '-c',
               type=click.Path(exists=True), default=DEFAULT_CONFIG_PATH,
               help='Task configuration yml. Defaults to tasks.yml')
+@click.option('--arrow-version', '-v', default=None,
+              help='Set target version explicitly')
 @click.option('--dry-run/--push', default=False,
               help='Just display the rendered CI configurations without '
                    'submitting them')
 @click.pass_context
-def submit(ctx, task, group, job_prefix, config_path, dry_run):
+def submit(ctx, task, group, job_prefix, config_path, arrow_version, dry_run):
     queue, arrow = ctx.obj['queue'], ctx.obj['arrow']
     target = Target.from_repo(arrow)
 
+    # explicitly set arrow version
+    if arrow_version:
+        target.version = arrow_version
+
     # task and group variables are lists, containing multiple values
     tasks = {}
     task_configs = load_tasks_from_config(config_path, task, group)
diff --git a/dev/tasks/linux-packages/Rakefile b/dev/tasks/linux-packages/Rakefile
index 0336420..bce23de 100644
--- a/dev/tasks/linux-packages/Rakefile
+++ b/dev/tasks/linux-packages/Rakefile
@@ -41,14 +41,15 @@ class ApacheArrowPackageTask < PackageTask
 
   def define_archive_task
     file @archive_name do
-      case @version
-      when /\A\d+\.\d+\.\d+-rc\d+\z/
-        download_rc_archive
-      when /\A\d+\.\d+\.\d+\z/
-        download_released_archive
-      else
-        build_archive
-      end
+      # case @version
+      # when /\A\d+\.\d+\.\d+-rc\d+\z/
+      #   download_rc_archive
+      # when /\A\d+\.\d+\.\d+\z/
+      #   download_released_archive
+      # else
+      #   build_archive
+      # end
+      build_archive
     end
   end