arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject [arrow-dist] branch master updated: ARROW-1448: Support uploading built .deb and .rpm to Bintray (#7)
Date Mon, 04 Sep 2017 00:07:45 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 8017e49  ARROW-1448: Support uploading built .deb and .rpm to Bintray (#7)
8017e49 is described below

commit 8017e491271616f4bbc38bbe48fce99696d4ede1
Author: Kouhei Sutou <kou@cozmixng.org>
AuthorDate: Mon Sep 4 09:07:43 2017 +0900

    ARROW-1448: Support uploading built .deb and .rpm to Bintray (#7)
    
    * Put to kou's Bintray
    
    * Fix a typo
---
 .travis.yml                            | 27 ++++++-----------------
 cpp-linux/apt/descriptor.json          | 39 +++++++++++++++++++++++++++++-----
 cpp-linux/package-task.rb              | 17 +++++++++------
 cpp-linux/yum/centos-6/descriptor.json | 20 -----------------
 cpp-linux/yum/centos-7/descriptor.json | 20 -----------------
 cpp-linux/yum/descriptor.json          | 22 +++++++++++++++++++
 6 files changed, 72 insertions(+), 73 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 345e8d8..2738d94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,41 +58,26 @@ matrix:
     deploy:
       provider: bintray
       file: cpp-linux/apt/descriptor.json
-      user: wesm
+      user: kou
       on:
         all_branches: true
       key:
-        secure: A4A5y/NqAAMTHynW7G0NsUOcZkWxUU84YGw+2Ltne1zfhxcQW2hFT0JjT1eTxm0nWkWuQZfd6bXc2W2G5W0uEaq2U/u+6oCMLuNxvrjQTbHzWI4CSdEfZHm2EZq/BewYHbRwPmi97uscOkgYhYZRSh8KGJZjcLVGHpzZAoC3D69JA2mynWpFOqXIiaL3rznE2LBz8L0UbttUnxTvgt8/yFJIbaPWzsoeS++T+DaFAm4GesY38uZ2NIq9OR62rlGre/ye/KBXsHkAzSlCbvIJgNvrAxId0GHCP5jEF389r8C5w+nttmLoCvyDvKRV5XcIeIACUlVdl01vcPs65LhBWqKE6wTo+2Vx1Zw+HWrfVsO6fINhbuJ+Uler2Zkq//chRRNtbzjI3so8VCBpQD+12O4Nlsfe6JJjgKgzhPNAQFSuE2cp8p6+Qs5FujKaVkVqYjhN8wH7U5nGuqM51ed8EeI1LuJg
[...]
+        secure: "XXRJFBIOGS9urF047KcGlCqnMwKWa/EhW1Q2A3JGDd7Au+NHd99Rl/iRbtd44xVnfhosKGEH9mBGrqIZb/Tfn3RTtSi/KvN2RIoWmdsc3Kxk1eKd6O9kCLo4Y1GqboK8JVIHD4OYiyoVoFmnYLuinfdtrZrME5aU4pENnvwR3E0qvjhnhfwRG/Mtb93ePAqzih95gT7S0VWlsBV3FPa21aY7ctFteUP+DdqXZX1BmUnJB6cBxUGjpL8Bu8O/mt3l3yIrT9UkWM1g75l7zrP354x5+AMbHWBv7yGFa+JvbB+LXkrE2dV6j3Upf6ChnQKoTKv5Ur5LJBbCHyRieW3/uE/h47IR3c/3mRnhoSIl4QX7UoQkvTwHSE1Xpry3I2jE0WVHmq9NqT4iaxIv5oga+3I/W6h8brV3yCYfVUi1F90aRlnZHsCDmtAqzW1u9s1xqkO4z4/dennI0gniEn4kWfx0I7a
[...]
   - language: ruby
     os: linux
     before_script:
     before_install:
     install:
     script:
-    - (cd cpp-linux && travis_wait 30 rake yum:build CENTOS_VERSIONS=6 DEBUG=no)
+    - (cd cpp-linux && travis_wait 30 rake yum:build PARALLEL=yes DEBUG=no)
     deploy:
       provider: bintray
-      file: cpp-linux/yum/centos-6/descriptor.json
-      user: wesm
+      file: cpp-linux/yum/descriptor.json
+      user: kou
       on:
         all_branches: true
       key:
-        secure: A4A5y/NqAAMTHynW7G0NsUOcZkWxUU84YGw+2Ltne1zfhxcQW2hFT0JjT1eTxm0nWkWuQZfd6bXc2W2G5W0uEaq2U/u+6oCMLuNxvrjQTbHzWI4CSdEfZHm2EZq/BewYHbRwPmi97uscOkgYhYZRSh8KGJZjcLVGHpzZAoC3D69JA2mynWpFOqXIiaL3rznE2LBz8L0UbttUnxTvgt8/yFJIbaPWzsoeS++T+DaFAm4GesY38uZ2NIq9OR62rlGre/ye/KBXsHkAzSlCbvIJgNvrAxId0GHCP5jEF389r8C5w+nttmLoCvyDvKRV5XcIeIACUlVdl01vcPs65LhBWqKE6wTo+2Vx1Zw+HWrfVsO6fINhbuJ+Uler2Zkq//chRRNtbzjI3so8VCBpQD+12O4Nlsfe6JJjgKgzhPNAQFSuE2cp8p6+Qs5FujKaVkVqYjhN8wH7U5nGuqM51ed8EeI1LuJg
[...]
-  - language: ruby
-    os: linux
-    before_script:
-    before_install:
-    install:
-    script:
-    - (cd cpp-linux && travis_wait 30 rake yum:build CENTOS_VERSIONS=7 DEBUG=no)
-    deploy:
-      provider: bintray
-      file: cpp-linux/yum/centos-7/descriptor.json
-      user: wesm
-      on:
-        all_branches: true
-      key:
-        secure: A4A5y/NqAAMTHynW7G0NsUOcZkWxUU84YGw+2Ltne1zfhxcQW2hFT0JjT1eTxm0nWkWuQZfd6bXc2W2G5W0uEaq2U/u+6oCMLuNxvrjQTbHzWI4CSdEfZHm2EZq/BewYHbRwPmi97uscOkgYhYZRSh8KGJZjcLVGHpzZAoC3D69JA2mynWpFOqXIiaL3rznE2LBz8L0UbttUnxTvgt8/yFJIbaPWzsoeS++T+DaFAm4GesY38uZ2NIq9OR62rlGre/ye/KBXsHkAzSlCbvIJgNvrAxId0GHCP5jEF389r8C5w+nttmLoCvyDvKRV5XcIeIACUlVdl01vcPs65LhBWqKE6wTo+2Vx1Zw+HWrfVsO6fINhbuJ+Uler2Zkq//chRRNtbzjI3so8VCBpQD+12O4Nlsfe6JJjgKgzhPNAQFSuE2cp8p6+Qs5FujKaVkVqYjhN8wH7U5nGuqM51ed8EeI1LuJg
[...]
+        secure: "XXRJFBIOGS9urF047KcGlCqnMwKWa/EhW1Q2A3JGDd7Au+NHd99Rl/iRbtd44xVnfhosKGEH9mBGrqIZb/Tfn3RTtSi/KvN2RIoWmdsc3Kxk1eKd6O9kCLo4Y1GqboK8JVIHD4OYiyoVoFmnYLuinfdtrZrME5aU4pENnvwR3E0qvjhnhfwRG/Mtb93ePAqzih95gT7S0VWlsBV3FPa21aY7ctFteUP+DdqXZX1BmUnJB6cBxUGjpL8Bu8O/mt3l3yIrT9UkWM1g75l7zrP354x5+AMbHWBv7yGFa+JvbB+LXkrE2dV6j3Upf6ChnQKoTKv5Ur5LJBbCHyRieW3/uE/h47IR3c/3mRnhoSIl4QX7UoQkvTwHSE1Xpry3I2jE0WVHmq9NqT4iaxIv5oga+3I/W6h8brV3yCYfVUi1F90aRlnZHsCDmtAqzW1u9s1xqkO4z4/dennI0gniEn4kWfx0I7a
[...]
 before_install:
 - brew uninstall boost
 - brew update
diff --git a/cpp-linux/apt/descriptor.json b/cpp-linux/apt/descriptor.json
index c7089ce..3d39ba0 100644
--- a/cpp-linux/apt/descriptor.json
+++ b/cpp-linux/apt/descriptor.json
@@ -2,21 +2,50 @@
     "package": {
         "name": "APT",
         "repo": "apache-arrow-apt",
-        "subject": "wesm"
+        "subject": "kou",
+        "licenses": ["Apache-2.0"],
+        "vcs_url": "htttps://github.com/apache/arrow.git"
     },
     "version": {
         "name": "0.6.0"
     },
     "files": [
         {
-            "includePattern": "cpp-linux/apt/repositories/*/pool/(*)/(*)/a/apache-arrow/(.*\\.deb)",
-            "uploadPattern": "$3",
+            "includePattern": "cpp-linux/apt/repositories/([^/]+)/pool/stretch/main/a/apache-arrow/([^/]+\\.deb)\\z",
+            "uploadPattern": "pool/stretch/main/$2",
             "matrixParams": {
-                "deb_distribution": "$1",
-                "deb_component": "$2",
+                "deb_distribution": "stretch",
+                "deb_component": "main",
                 "deb_architecture": "amd64",
                 "override": 1
             }
+        },
+        {
+            "includePattern": "cpp-linux/apt/repositories/([^/]+)/pool/trusty/universe/a/apache-arrow/([^/]+\\.deb)\\z",
+            "uploadPattern": "pool/trusty/universe/$2",
+            "matrixParams": {
+                "deb_distribution": "trusty",
+                "deb_component": "universe",
+                "deb_architecture": "amd64",
+                "override": 1
+            }
+        },
+        {
+            "includePattern": "cpp-linux/apt/repositories/([^/]+)/pool/xenial/universe/a/apache-arrow/([^/]+\\.deb)\\z",
+            "uploadPattern": "pool/xenial/universe/$2",
+            "matrixParams": {
+                "deb_distribution": "xenial",
+                "deb_component": "universe",
+                "deb_architecture": "amd64",
+                "override": 1
+            }
+        },
+        {
+            "includePattern": "cpp-linux/apt/repositories/([^/]+)/pool/([^/]+)/([^/]+)/a/apache-arrow/([^/]+(?!\\.deb\\z)\\..+)\\z",
+            "uploadPattern": "pool/$2/$3/$4",
+            "matrixParams": {
+                "override": 1
+            }
         }
     ],
     "publish": true
diff --git a/cpp-linux/package-task.rb b/cpp-linux/package-task.rb
index c9a0755..ccca6db 100644
--- a/cpp-linux/package-task.rb
+++ b/cpp-linux/package-task.rb
@@ -179,11 +179,6 @@ VERSION=#{@version}
 
   def define_apt_task
     namespace :apt do
-      code_names = [
-        ["debian", "stretch"],
-        ["ubuntu", "16.04"],
-        ["ubuntu", "17.04"],
-      ]
       debian_dir = "debian"
       apt_dir = "apt"
       repositories_dir = "#{apt_dir}/repositories"
@@ -208,8 +203,16 @@ VERSION=#{@version}
 
         cd(apt_dir) do
           threads = []
-          code_names.each do |distribution, code_name|
-            id = "#{distribution}-#{code_name}"
+          targets = (ENV["APT_TARGETS"] || "").split(",")
+          if targets.empty?
+            targets = [
+              "debian-stretch",
+              "ubuntu-16.04",
+              "ubuntu-17.04",
+            ]
+          end
+          targets.each do |target|
+            id = target
             if parallel_build?
               threads << Thread.new(id) do |local_id|
                 run_docker(local_id)
diff --git a/cpp-linux/yum/centos-6/descriptor.json b/cpp-linux/yum/centos-6/descriptor.json
deleted file mode 100644
index b3833a7..0000000
--- a/cpp-linux/yum/centos-6/descriptor.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "package": {
-        "name": "Yum: CentOS 6",
-        "repo": "apache-arrow-yum-centos-6",
-        "subject": "wesm"
-    },
-    "version": {
-        "name": "0.6.0"
-    },
-    "files": [
-        {
-            "includePattern": "cpp-linux/yum/repositories/centos/6/*/*/(.*\\.rpm)",
-            "uploadPattern": "$1",
-            "matrixParams": {
-                "override": 1
-            }
-        }
-    ],
-    "publish": true
-}
diff --git a/cpp-linux/yum/centos-7/descriptor.json b/cpp-linux/yum/centos-7/descriptor.json
deleted file mode 100644
index 7a9459d..0000000
--- a/cpp-linux/yum/centos-7/descriptor.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "package": {
-        "name": "Yum: CentOS 7",
-        "repo": "apache-arrow-yum-centos-7",
-        "subject": "wesm"
-    },
-    "version": {
-        "name": "0.6.0"
-    },
-    "files": [
-        {
-            "includePattern": "cpp-linux/yum/repositories/centos/7/*/*/(.*\\.rpm)",
-            "uploadPattern": "$1",
-            "matrixParams": {
-                "override": 1
-            }
-        }
-    ],
-    "publish": true
-}
diff --git a/cpp-linux/yum/descriptor.json b/cpp-linux/yum/descriptor.json
new file mode 100644
index 0000000..f0bf276
--- /dev/null
+++ b/cpp-linux/yum/descriptor.json
@@ -0,0 +1,22 @@
+{
+    "package": {
+        "name": "Yum",
+        "repo": "apache-arrow-yum",
+        "subject": "kou",
+        "licenses": ["Apache-2.0"],
+        "vcs_url": "htttps://github.com/apache/arrow.git"
+    },
+    "version": {
+        "name": "0.6.0"
+    },
+    "files": [
+        {
+            "includePattern": "cpp-linux/yum/repositories/(centos)/([^/]+)/([^/]+)/[^/]+/([^/]+\\.rpm)",
+            "uploadPattern": "$1/$2/$3/$4",
+            "matrixParams": {
+                "override": 1
+            }
+        }
+    ],
+    "publish": true
+}

-- 
To stop receiving notification emails like this one, please contact
['"commits@arrow.apache.org" <commits@arrow.apache.org>'].

Mime
View raw message