Skip to content

Commit d7bc378

Browse files
authored
apacheGH-44706: [Release][Archery][Packaging] Add "so_version" variable (apache#44707)
### Rationale for this change SO versions must be computed from the target version instead of embedding them to `dev/tasks/tasks.yaml`. Because they depend on the specified version as an argument. ### What changes are included in this PR? Add `so_version` variable that can be used in `dev/tasks/tasks.yml`. ### Are these changes tested? Yes. apache#44699 (comment) used this. ### Are there any user-facing changes? No. * GitHub Issue: apache#44706 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Raúl Cumplido <[email protected]>
1 parent ae0f60a commit d7bc378

File tree

5 files changed

+41
-52
lines changed

5 files changed

+41
-52
lines changed

dev/archery/archery/crossbow/core.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -820,10 +820,18 @@ def __init__(self, head, branch, remote, version, r_version, email=None):
820820
#
821821
# Example:
822822
#
823-
# '10.0.0.dev235' ->
824-
# '10.0.0-SNAPSHOT'
823+
# '10.0.0.dev235' ->
824+
# '10.0.0-SNAPSHOT'
825825
self.no_rc_snapshot_version = re.sub(
826826
r'\.(dev\d+)$', '-SNAPSHOT', self.no_rc_version)
827+
# SO (shared object) version for C++/C GLib
828+
#
829+
# Example:
830+
#
831+
# '18.1.0' ->
832+
# '1801'
833+
major, minor = map(int, self.no_rc_version.split(".")[0:2])
834+
self.so_version = f"{major * 100 + minor}"
827835

828836
@classmethod
829837
def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
@@ -1191,6 +1199,7 @@ def from_config(cls, config, target, tasks=None, groups=None, params=None):
11911199
'no_rc_snapshot_version': target.no_rc_snapshot_version,
11921200
'r_version': target.r_version,
11931201
'no_rc_r_version': target.no_rc_r_version,
1202+
'so_version': target.so_version,
11941203
}
11951204
for task_name, task in task_definitions.items():
11961205
task = task.copy()

dev/release/01-prepare-test.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@ def test_deb_package_names
7676
],
7777
path: "dev/tasks/linux-packages/apache-arrow/debian/control.in",
7878
},
79-
{
80-
sampled_diff: [
81-
"- - libarrow-acero#{@snapshot_so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
82-
"+ - libarrow-acero#{@so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
83-
],
84-
path: "dev/tasks/tasks.yml",
85-
},
8679
]
8780
else
8881
expected_changes = []

dev/release/post-12-bump-versions-test.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -333,13 +333,6 @@ def test_deb_package_names
333333
],
334334
path: "dev/tasks/linux-packages/apache-arrow/debian/control.in",
335335
},
336-
{
337-
sampled_diff: [
338-
"- - libarrow-acero#{@so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
339-
"+ - libarrow-acero#{@next_so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
340-
],
341-
path: "dev/tasks/tasks.yml",
342-
},
343336
]
344337
else
345338
expected_changes = []

dev/release/utils-prepare.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,6 @@ update_deb_package_names() {
231231
git add debian*/control*
232232
popd
233233

234-
pushd ${ARROW_DIR}/dev/tasks
235-
sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" tasks.yml
236-
rm -f tasks.yml.bak
237-
git add tasks.yml
238-
popd
239-
240234
pushd ${ARROW_DIR}/dev/release
241235
sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" rat_exclude_files.txt
242236
rm -f rat_exclude_files.txt.bak

dev/tasks/tasks.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -513,59 +513,59 @@ tasks:
513513
- gir1.2-gandiva-1.0_{no_rc_version}-1_[a-z0-9]+.deb
514514
- gir1.2-parquet-1.0_{no_rc_version}-1_[a-z0-9]+.deb
515515
- libarrow-acero-dev_{no_rc_version}-1_[a-z0-9]+.deb
516-
- libarrow-acero1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
517-
- libarrow-acero1900_{no_rc_version}-1_[a-z0-9]+.deb
516+
- libarrow-acero{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
517+
- libarrow-acero{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
518518
- libarrow-dataset-dev_{no_rc_version}-1_[a-z0-9]+.deb
519519
- libarrow-dataset-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
520520
- libarrow-dataset-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
521-
- libarrow-dataset-glib1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
522-
- libarrow-dataset-glib1900_{no_rc_version}-1_[a-z0-9]+.deb
523-
- libarrow-dataset1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
524-
- libarrow-dataset1900_{no_rc_version}-1_[a-z0-9]+.deb
521+
- libarrow-dataset-glib{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
522+
- libarrow-dataset-glib{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
523+
- libarrow-dataset{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
524+
- libarrow-dataset{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
525525
- libarrow-dev_{no_rc_version}-1_[a-z0-9]+.deb
526526
- libarrow-flight-dev_{no_rc_version}-1_[a-z0-9]+.deb
527527
- libarrow-flight-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
528528
- libarrow-flight-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
529-
- libarrow-flight-glib1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
530-
- libarrow-flight-glib1900_{no_rc_version}-1_[a-z0-9]+.deb
529+
- libarrow-flight-glib{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
530+
- libarrow-flight-glib{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
531531
- libarrow-flight-sql-dev_{no_rc_version}-1_[a-z0-9]+.deb
532532
- libarrow-flight-sql-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
533533
- libarrow-flight-sql-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
534-
- libarrow-flight-sql-glib1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
535-
- libarrow-flight-sql-glib1900_{no_rc_version}-1_[a-z0-9]+.deb
536-
- libarrow-flight-sql1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
537-
- libarrow-flight-sql1900_{no_rc_version}-1_[a-z0-9]+.deb
538-
- libarrow-flight1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
539-
- libarrow-flight1900_{no_rc_version}-1_[a-z0-9]+.deb
534+
- libarrow-flight-sql-glib{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
535+
- libarrow-flight-sql-glib{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
536+
- libarrow-flight-sql{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
537+
- libarrow-flight-sql{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
538+
- libarrow-flight{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
539+
- libarrow-flight{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
540540
- libarrow-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
541541
- libarrow-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
542-
- libarrow-glib1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
543-
- libarrow-glib1900_{no_rc_version}-1_[a-z0-9]+.deb
544-
- libarrow1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
545-
- libarrow1900_{no_rc_version}-1_[a-z0-9]+.deb
542+
- libarrow-glib{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
543+
- libarrow-glib{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
544+
- libarrow{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
545+
- libarrow{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
546546
- libgandiva-dev_{no_rc_version}-1_[a-z0-9]+.deb
547547
- libgandiva-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
548548
- libgandiva-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
549-
- libgandiva-glib1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
550-
- libgandiva-glib1900_{no_rc_version}-1_[a-z0-9]+.deb
551-
- libgandiva1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
552-
- libgandiva1900_{no_rc_version}-1_[a-z0-9]+.deb
549+
- libgandiva-glib{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
550+
- libgandiva-glib{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
551+
- libgandiva{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
552+
- libgandiva{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
553553
- libparquet-dev_{no_rc_version}-1_[a-z0-9]+.deb
554554
- libparquet-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
555555
- libparquet-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
556-
- libparquet-glib1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
557-
- libparquet-glib1900_{no_rc_version}-1_[a-z0-9]+.deb
558-
- libparquet1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
559-
- libparquet1900_{no_rc_version}-1_[a-z0-9]+.deb
556+
- libparquet-glib{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
557+
- libparquet-glib{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
558+
- libparquet{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
559+
- libparquet{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
560560
- parquet-tools_{no_rc_version}-1_[a-z0-9]+.deb
561561
{% if architecture == "amd64" %}
562562
- gir1.2-arrow-cuda-1.0_{no_rc_version}-1_[a-z0-9]+.deb
563563
- libarrow-cuda-dev_{no_rc_version}-1_[a-z0-9]+.deb
564564
- libarrow-cuda-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
565-
- libarrow-cuda-glib1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
566-
- libarrow-cuda-glib1900_{no_rc_version}-1_[a-z0-9]+.deb
567-
- libarrow-cuda1900-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
568-
- libarrow-cuda1900_{no_rc_version}-1_[a-z0-9]+.deb
565+
- libarrow-cuda-glib{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
566+
- libarrow-cuda-glib{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
567+
- libarrow-cuda{so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
568+
- libarrow-cuda{so_version}_{no_rc_version}-1_[a-z0-9]+.deb
569569
{% endif %}
570570
{% endfor %}
571571
{% endfor %}

0 commit comments

Comments
 (0)