You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/08/04 22:08:18 UTC
[arrow] branch master updated: ARROW-2962: [Packaging] Bintray
descriptor files are no longer needed
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.git
The following commit(s) were added to refs/heads/master by this push:
new 41bb85b ARROW-2962: [Packaging] Bintray descriptor files are no longer needed
41bb85b is described below
commit 41bb85b57dde4b964e60ac13d79e3ca1c359c225
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Sat Aug 4 18:07:55 2018 -0400
ARROW-2962: [Packaging] Bintray descriptor files are no longer needed
Wait for [build-302](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-302) to pass
Author: Krisztián Szűcs <sz...@gmail.com>
Closes #2357 from kszucs/ARROW-2962 and squashes the following commits:
7445b8cb <Krisztián Szűcs> remove bintray descriptors
8baabdac <Krisztián Szűcs> don't update descriptor in rake task
---
dev/tasks/linux-packages/apt/descriptor.json | 45 ----------------------------
dev/tasks/linux-packages/package-task.rb | 10 -------
dev/tasks/linux-packages/yum/descriptor.json | 22 --------------
3 files changed, 77 deletions(-)
diff --git a/dev/tasks/linux-packages/apt/descriptor.json b/dev/tasks/linux-packages/apt/descriptor.json
deleted file mode 100644
index d45ed85..0000000
--- a/dev/tasks/linux-packages/apt/descriptor.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "package": {
- "name": "APT",
- "repo": "apache-arrow-apt",
- "subject": "kou",
- "licenses": ["Apache-2.0"],
- "vcs_url": "htttps://github.com/apache/arrow.git"
- },
- "version": {
- "name": "dev"
- },
- "files": [
- {
- "includePattern": "dev/tasks/linux-packages/apt/repositories/([^/]+)/pool/stretch/main/a/apache-arrow/([^/]+\\.deb)\\z",
- "uploadPattern": "pool/stretch/main/$2",
- "matrixParams": {
- "deb_distribution": "stretch",
- "deb_component": "main",
- "deb_architecture": "amd64",
- "override": 1
- }
- },
- {
- "includePattern": "dev/tasks/linux-packages/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": "dev/tasks/linux-packages/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
- }
- }
- ],
- "publish": true
-}
diff --git a/dev/tasks/linux-packages/package-task.rb b/dev/tasks/linux-packages/package-task.rb
index 29468a1..b8f25ae 100644
--- a/dev/tasks/linux-packages/package-task.rb
+++ b/dev/tasks/linux-packages/package-task.rb
@@ -266,7 +266,6 @@ VERSION=#{@deb_upstream_version}
task :update do
update_debian_changelog
update_spec
- update_descriptor
end
end
end
@@ -325,13 +324,4 @@ VERSION=#{@deb_upstream_version}
end
end
- def update_descriptor
- Dir.glob("**/descriptor.json") do |descriptor_json|
- update_content(descriptor_json) do |content|
- content = content.sub(/"name": "\d+\.\d+\.\d+.*?"/) do
- "\"name\": \"#{@version}\""
- end
- end
- end
- end
end
diff --git a/dev/tasks/linux-packages/yum/descriptor.json b/dev/tasks/linux-packages/yum/descriptor.json
deleted file mode 100644
index b025b17..0000000
--- a/dev/tasks/linux-packages/yum/descriptor.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "package": {
- "name": "Yum",
- "repo": "apache-arrow-yum",
- "subject": "kou",
- "licenses": ["Apache-2.0"],
- "vcs_url": "htttps://github.com/apache/arrow.git"
- },
- "version": {
- "name": "dev"
- },
- "files": [
- {
- "includePattern": "cpp-linux/yum/repositories/(centos)/([^/]+)/([^/]+)/[^/]+/([^/]+\\.rpm)",
- "uploadPattern": "$1/$2/$3/$4",
- "matrixParams": {
- "override": 1
- }
- }
- ],
- "publish": true
-}