Skip to content

ARROW-3423: [Packaging] Remove RC information from deb/rpm packages #2694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kou wants to merge 1 commit into from
Closed

ARROW-3423: [Packaging] Remove RC information from deb/rpm packages #2694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion dev/tasks/crossbow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,13 +599,19 @@ def submit(ctx, task, group, job_prefix, config_path, arrow_version, dry_run):
if arrow_version:
target.version = arrow_version

no_rc_version = re.sub(r'-rc\d+\Z', '', target.version)
params = {
'version': target.version,
'no_rc_version': no_rc_version,
}

# task and group variables are lists, containing multiple values
tasks = {}
task_configs = load_tasks_from_config(config_path, task, group)
for name, task in task_configs.items():
# replace version number and create task instance from configuration
artifacts = task.pop('artifacts', None) or [] # because of yaml
artifacts = [fn.format(version=target.version) for fn in artifacts]
artifacts = [fn.format(**params) for fn in artifacts]
tasks[name] = Task(artifacts=artifacts, **task)

# create job instance, doesn't mutate git data yet
Expand Down
5 changes: 4 additions & 1 deletion dev/tasks/linux-packages/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ require_relative "package-task"
class ApacheArrowPackageTask < PackageTask
def initialize
release_time = detect_release_time
super("apache-arrow", detect_version(release_time), release_time)
super("apache-arrow",
detect_version(release_time),
release_time,
:rc_build_type => :release)
@rpm_package = "arrow"
end

Expand Down
17 changes: 12 additions & 5 deletions dev/tasks/linux-packages/package-task.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class PackageTask
include Rake::DSL

def initialize(package, version, release_time)
def initialize(package, version, release_time, options={})
@package = package
@version = version
@release_time = release_time
Expand All @@ -33,12 +33,19 @@ def initialize(package, version, release_time)

@rpm_package = @package
case @version
when /-((?:dev|rc)\d+)\z/
when /-((dev|rc)\d+)\z/
base_version = $PREMATCH
sub_version = $1
@deb_upstream_version = "#{base_version}~#{sub_version}"
@rpm_version = base_version
@rpm_release = "0.#{sub_version}"
type = $2
if type == "rc" and options[:rc_build_type] == :release
@deb_upstream_version = base_version
@rpm_version = base_version
@rpm_release = "1"
else
@deb_upstream_version = "#{base_version}~#{sub_version}"
@rpm_version = base_version
@rpm_release = "0.#{sub_version}"
end
else
@deb_upstream_version = @version
@rpm_version = @version
Expand Down
216 changes: 108 additions & 108 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,35 +239,35 @@ tasks:
- .debian.tar.xz
- .orig.tar.gz
artifacts:
- apache-arrow_{version}-1.debian.tar.xz
- apache-arrow_{version}-1.dsc
- apache-arrow_{version}.orig.tar.gz
- gir1.2-arrow-1.0_{version}-1_amd64.deb
- gir1.2-arrow-gpu-1.0_{version}-1_amd64.deb
- gir1.2-parquet-1.0_{version}-1_amd64.deb
- libarrow-dev_{version}-1_amd64.deb
- libarrow-glib-dev_{version}-1_amd64.deb
- libarrow-glib-doc_{version}-1_all.deb
- libarrow-glib11-dbgsym_{version}-1_amd64.deb
- libarrow-glib11_{version}-1_amd64.deb
- libarrow-gpu-dev_{version}-1_amd64.deb
- libarrow-gpu-glib-dev_{version}-1_amd64.deb
- libarrow-gpu-glib11-dbgsym_{version}-1_amd64.deb
- libarrow-gpu-glib11_{version}-1_amd64.deb
- libarrow-gpu11-dbgsym_{version}-1_amd64.deb
- libarrow-gpu11_{version}-1_amd64.deb
- libarrow-python-dev_{version}-1_amd64.deb
- libarrow-python11-dbgsym_{version}-1_amd64.deb
- libarrow-python11_{version}-1_amd64.deb
- libarrow11-dbgsym_{version}-1_amd64.deb
- libarrow11_{version}-1_amd64.deb
- libparquet-dev_{version}-1_amd64.deb
- libparquet-glib-dev_{version}-1_amd64.deb
- libparquet-glib-doc_{version}-1_all.deb
- libparquet-glib11-dbgsym_{version}-1_amd64.deb
- libparquet-glib11_{version}-1_amd64.deb
- libparquet11-dbgsym_{version}-1_amd64.deb
- libparquet11_{version}-1_amd64.deb
- apache-arrow_{no_rc_version}-1.debian.tar.xz
- apache-arrow_{no_rc_version}-1.dsc
- apache-arrow_{no_rc_version}.orig.tar.gz
- gir1.2-arrow-1.0_{no_rc_version}-1_amd64.deb
- gir1.2-arrow-gpu-1.0_{no_rc_version}-1_amd64.deb
- gir1.2-parquet-1.0_{no_rc_version}-1_amd64.deb
- libarrow-dev_{no_rc_version}-1_amd64.deb
- libarrow-glib-dev_{no_rc_version}-1_amd64.deb
- libarrow-glib-doc_{no_rc_version}-1_all.deb
- libarrow-glib11-dbgsym_{no_rc_version}-1_amd64.deb
- libarrow-glib11_{no_rc_version}-1_amd64.deb
- libarrow-gpu-dev_{no_rc_version}-1_amd64.deb
- libarrow-gpu-glib-dev_{no_rc_version}-1_amd64.deb
- libarrow-gpu-glib11-dbgsym_{no_rc_version}-1_amd64.deb
- libarrow-gpu-glib11_{no_rc_version}-1_amd64.deb
- libarrow-gpu11-dbgsym_{no_rc_version}-1_amd64.deb
- libarrow-gpu11_{no_rc_version}-1_amd64.deb
- libarrow-python-dev_{no_rc_version}-1_amd64.deb
- libarrow-python11-dbgsym_{no_rc_version}-1_amd64.deb
- libarrow-python11_{no_rc_version}-1_amd64.deb
- libarrow11-dbgsym_{no_rc_version}-1_amd64.deb
- libarrow11_{no_rc_version}-1_amd64.deb
- libparquet-dev_{no_rc_version}-1_amd64.deb
- libparquet-glib-dev_{no_rc_version}-1_amd64.deb
- libparquet-glib-doc_{no_rc_version}-1_all.deb
- libparquet-glib11-dbgsym_{no_rc_version}-1_amd64.deb
- libparquet-glib11_{no_rc_version}-1_amd64.deb
- libparquet11-dbgsym_{no_rc_version}-1_amd64.deb
- libparquet11_{no_rc_version}-1_amd64.deb

ubuntu-trusty:
platform: linux
Expand All @@ -280,21 +280,21 @@ tasks:
- .debian.tar.gz
- .orig.tar.gz
artifacts:
- apache-arrow_{version}-1.debian.tar.gz
- apache-arrow_{version}-1.dsc
- apache-arrow_{version}.orig.tar.gz
- gir1.2-arrow-1.0_{version}-1_amd64.deb
- gir1.2-parquet-1.0_{version}-1_amd64.deb
- libarrow-dev_{version}-1_amd64.deb
- libarrow-glib-dev_{version}-1_amd64.deb
- libarrow-glib-doc_{version}-1_all.deb
- libarrow-glib11_{version}-1_amd64.deb
- libarrow11_{version}-1_amd64.deb
- libparquet-dev_{version}-1_amd64.deb
- libparquet-glib-dev_{version}-1_amd64.deb
- libparquet-glib-doc_{version}-1_all.deb
- libparquet-glib11_{version}-1_amd64.deb
- libparquet11_{version}-1_amd64.deb
- apache-arrow_{no_rc_version}-1.debian.tar.gz
- apache-arrow_{no_rc_version}-1.dsc
- apache-arrow_{no_rc_version}.orig.tar.gz
- gir1.2-arrow-1.0_{no_rc_version}-1_amd64.deb
- gir1.2-parquet-1.0_{no_rc_version}-1_amd64.deb
- libarrow-dev_{no_rc_version}-1_amd64.deb
- libarrow-glib-dev_{no_rc_version}-1_amd64.deb
- libarrow-glib-doc_{no_rc_version}-1_all.deb
- libarrow-glib11_{no_rc_version}-1_amd64.deb
- libarrow11_{no_rc_version}-1_amd64.deb
- libparquet-dev_{no_rc_version}-1_amd64.deb
- libparquet-glib-dev_{no_rc_version}-1_amd64.deb
- libparquet-glib-doc_{no_rc_version}-1_all.deb
- libparquet-glib11_{no_rc_version}-1_amd64.deb
- libparquet11_{no_rc_version}-1_amd64.deb

ubuntu-xenial:
platform: linux
Expand All @@ -307,28 +307,28 @@ tasks:
- .debian.tar.xz
- .orig.tar.gz
artifacts:
- apache-arrow_{version}-1.debian.tar.xz
- apache-arrow_{version}-1.dsc
- apache-arrow_{version}.orig.tar.gz
- gir1.2-arrow-1.0_{version}-1_amd64.deb
- gir1.2-arrow-gpu-1.0_{version}-1_amd64.deb
- gir1.2-parquet-1.0_{version}-1_amd64.deb
- libarrow-dev_{version}-1_amd64.deb
- libarrow-glib-dev_{version}-1_amd64.deb
- libarrow-glib-doc_{version}-1_all.deb
- libarrow-glib11_{version}-1_amd64.deb
- libarrow-gpu-dev_{version}-1_amd64.deb
- libarrow-gpu-glib-dev_{version}-1_amd64.deb
- libarrow-gpu-glib11_{version}-1_amd64.deb
- libarrow-gpu11_{version}-1_amd64.deb
- libarrow-python-dev_{version}-1_amd64.deb
- libarrow-python11_{version}-1_amd64.deb
- libarrow11_{version}-1_amd64.deb
- libparquet-dev_{version}-1_amd64.deb
- libparquet-glib-dev_{version}-1_amd64.deb
- libparquet-glib-doc_{version}-1_all.deb
- libparquet-glib11_{version}-1_amd64.deb
- libparquet11_{version}-1_amd64.deb
- apache-arrow_{no_rc_version}-1.debian.tar.xz
- apache-arrow_{no_rc_version}-1.dsc
- apache-arrow_{no_rc_version}.orig.tar.gz
- gir1.2-arrow-1.0_{no_rc_version}-1_amd64.deb
- gir1.2-arrow-gpu-1.0_{no_rc_version}-1_amd64.deb
- gir1.2-parquet-1.0_{no_rc_version}-1_amd64.deb
- libarrow-dev_{no_rc_version}-1_amd64.deb
- libarrow-glib-dev_{no_rc_version}-1_amd64.deb
- libarrow-glib-doc_{no_rc_version}-1_all.deb
- libarrow-glib11_{no_rc_version}-1_amd64.deb
- libarrow-gpu-dev_{no_rc_version}-1_amd64.deb
- libarrow-gpu-glib-dev_{no_rc_version}-1_amd64.deb
- libarrow-gpu-glib11_{no_rc_version}-1_amd64.deb
- libarrow-gpu11_{no_rc_version}-1_amd64.deb
- libarrow-python-dev_{no_rc_version}-1_amd64.deb
- libarrow-python11_{no_rc_version}-1_amd64.deb
- libarrow11_{no_rc_version}-1_amd64.deb
- libparquet-dev_{no_rc_version}-1_amd64.deb
- libparquet-glib-dev_{no_rc_version}-1_amd64.deb
- libparquet-glib-doc_{no_rc_version}-1_all.deb
- libparquet-glib11_{no_rc_version}-1_amd64.deb
- libparquet11_{no_rc_version}-1_amd64.deb

ubuntu-bionic:
platform: linux
Expand All @@ -341,28 +341,28 @@ tasks:
- .debian.tar.xz
- .orig.tar.gz
artifacts:
- apache-arrow_{version}-1.debian.tar.xz
- apache-arrow_{version}-1.dsc
- apache-arrow_{version}.orig.tar.gz
- gir1.2-arrow-1.0_{version}-1_amd64.deb
- gir1.2-arrow-gpu-1.0_{version}-1_amd64.deb
- gir1.2-parquet-1.0_{version}-1_amd64.deb
- libarrow-dev_{version}-1_amd64.deb
- libarrow-glib-dev_{version}-1_amd64.deb
- libarrow-glib-doc_{version}-1_all.deb
- libarrow-glib11_{version}-1_amd64.deb
- libarrow-gpu-dev_{version}-1_amd64.deb
- libarrow-gpu-glib-dev_{version}-1_amd64.deb
- libarrow-gpu-glib11_{version}-1_amd64.deb
- libarrow-gpu11_{version}-1_amd64.deb
- libarrow-python-dev_{version}-1_amd64.deb
- libarrow-python11_{version}-1_amd64.deb
- libarrow11_{version}-1_amd64.deb
- libparquet-dev_{version}-1_amd64.deb
- libparquet-glib-dev_{version}-1_amd64.deb
- libparquet-glib-doc_{version}-1_all.deb
- libparquet-glib11_{version}-1_amd64.deb
- libparquet11_{version}-1_amd64.deb
- apache-arrow_{no_rc_version}-1.debian.tar.xz
- apache-arrow_{no_rc_version}-1.dsc
- apache-arrow_{no_rc_version}.orig.tar.gz
- gir1.2-arrow-1.0_{no_rc_version}-1_amd64.deb
- gir1.2-arrow-gpu-1.0_{no_rc_version}-1_amd64.deb
- gir1.2-parquet-1.0_{no_rc_version}-1_amd64.deb
- libarrow-dev_{no_rc_version}-1_amd64.deb
- libarrow-glib-dev_{no_rc_version}-1_amd64.deb
- libarrow-glib-doc_{no_rc_version}-1_all.deb
- libarrow-glib11_{no_rc_version}-1_amd64.deb
- libarrow-gpu-dev_{no_rc_version}-1_amd64.deb
- libarrow-gpu-glib-dev_{no_rc_version}-1_amd64.deb
- libarrow-gpu-glib11_{no_rc_version}-1_amd64.deb
- libarrow-gpu11_{no_rc_version}-1_amd64.deb
- libarrow-python-dev_{no_rc_version}-1_amd64.deb
- libarrow-python11_{no_rc_version}-1_amd64.deb
- libarrow11_{no_rc_version}-1_amd64.deb
- libparquet-dev_{no_rc_version}-1_amd64.deb
- libparquet-glib-dev_{no_rc_version}-1_amd64.deb
- libparquet-glib-doc_{no_rc_version}-1_all.deb
- libparquet-glib11_{no_rc_version}-1_amd64.deb
- libparquet11_{no_rc_version}-1_amd64.deb

centos-6:
platform: linux
Expand All @@ -372,12 +372,12 @@ tasks:
upload_extensions:
- .rpm
artifacts:
- arrow-{version}-1.el6.src.rpm
- arrow-debuginfo-{version}-1.el6.x86_64.rpm
- arrow-devel-{version}-1.el6.x86_64.rpm
- arrow-libs-{version}-1.el6.x86_64.rpm
- arrow-python-devel-{version}-1.el6.x86_64.rpm
- arrow-python-libs-{version}-1.el6.x86_64.rpm
- arrow-{no_rc_version}-1.el6.src.rpm
- arrow-debuginfo-{no_rc_version}-1.el6.x86_64.rpm
- arrow-devel-{no_rc_version}-1.el6.x86_64.rpm
- arrow-libs-{no_rc_version}-1.el6.x86_64.rpm
- arrow-python-devel-{no_rc_version}-1.el6.x86_64.rpm
- arrow-python-libs-{no_rc_version}-1.el6.x86_64.rpm

centos-7:
platform: linux
Expand All @@ -387,17 +387,17 @@ tasks:
upload_extensions:
- .rpm
artifacts:
- arrow-{version}-1.el7.src.rpm
- arrow-debuginfo-{version}-1.el7.x86_64.rpm
- arrow-devel-{version}-1.el7.x86_64.rpm
- arrow-glib-devel-{version}-1.el7.x86_64.rpm
- arrow-glib-doc-{version}-1.el7.x86_64.rpm
- arrow-glib-libs-{version}-1.el7.x86_64.rpm
- arrow-libs-{version}-1.el7.x86_64.rpm
- arrow-python-devel-{version}-1.el7.x86_64.rpm
- arrow-python-libs-{version}-1.el7.x86_64.rpm
- parquet-devel-{version}-1.el7.x86_64.rpm
- parquet-glib-devel-{version}-1.el7.x86_64.rpm
- parquet-glib-doc-{version}-1.el7.x86_64.rpm
- parquet-glib-libs-{version}-1.el7.x86_64.rpm
- parquet-libs-{version}-1.el7.x86_64.rpm
- arrow-{no_rc_version}-1.el7.src.rpm
- arrow-debuginfo-{no_rc_version}-1.el7.x86_64.rpm
- arrow-devel-{no_rc_version}-1.el7.x86_64.rpm
- arrow-glib-devel-{no_rc_version}-1.el7.x86_64.rpm
- arrow-glib-doc-{no_rc_version}-1.el7.x86_64.rpm
- arrow-glib-libs-{no_rc_version}-1.el7.x86_64.rpm
- arrow-libs-{no_rc_version}-1.el7.x86_64.rpm
- arrow-python-devel-{no_rc_version}-1.el7.x86_64.rpm
- arrow-python-libs-{no_rc_version}-1.el7.x86_64.rpm
- parquet-devel-{no_rc_version}-1.el7.x86_64.rpm
- parquet-glib-devel-{no_rc_version}-1.el7.x86_64.rpm
- parquet-glib-doc-{no_rc_version}-1.el7.x86_64.rpm
- parquet-glib-libs-{no_rc_version}-1.el7.x86_64.rpm
- parquet-libs-{no_rc_version}-1.el7.x86_64.rpm