Skip to content

Commit b0c968c

Browse files
kszucskszucs
committed
ARROW-12405: [Packaging] Fix apt artifact patterns and artifact uploading from travis
Builds: https://github.com/ursacomputing/crossbow/branches/all?query=build-242 Closes #10050 from kszucs/apt-crossbow-patterns Authored-by: Krisztián Szűcs <[email protected]> Signed-off-by: Krisztián Szűcs <[email protected]>
1 parent e0c5dad commit b0c968c

File tree

5 files changed

+27
-24
lines changed

5 files changed

+27
-24
lines changed

‎dev/release/binary-task.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,7 @@ def define_apt_rc_tasks
13161316

13171317
desc "Update RC APT repositories"
13181318
task :update do
1319-
apt_update(apt_rc_repositiries_dir)
1319+
apt_update(apt_rc_repositories_dir)
13201320
apt_targets.each do |distribution, code_name, component|
13211321
base_dir = "#{apt_rc_repositories_dir}/#{distribution}"
13221322
dists_dir = "#{base_dir}/dists/#{code_name}"

‎dev/tasks/linux-packages/travis.linux.arm64.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ env:
6868
- YUM_TARGETS={{ target }}
6969

7070
before_script:
71+
- set -e
7172
{{ macros.travis_checkout_arrow() }}
7273
{{ macros.travis_docker_login() }}
7374

@@ -144,4 +145,5 @@ script:
144145
- popd
145146

146147
after_success:
147-
{{ macros.travis_upload_releases(upload_extensions) }}
148+
{% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/**/*{}") %}
149+
{{ macros.travis_upload_releases(patterns) }}

‎dev/tasks/macros.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ on:
170170

171171
{%- macro travis_upload_releases(pattern) -%}
172172
- sudo -H pip3 install pygit2==1.0
173-
- sudo -H pip3 install arrow/dev/archery[crossbow]
173+
- sudo -H pip3 install -e arrow/dev/archery[crossbow]
174174
- |
175-
archery crossbow
175+
archery crossbow \
176176
--queue-path $(pwd) \
177177
--queue-remote {{ queue_remote_url }} \
178178
upload-artifacts \

‎dev/tasks/python-wheels/travis.linux.arm64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ env:
4545
- PYTHON={{ python_version }}
4646

4747
before_script:
48+
- set -e
4849
{{ macros.travis_checkout_arrow() }}
4950
{{ macros.travis_docker_login() }}
5051

‎dev/tasks/tasks.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,10 @@ tasks:
448448
- .dsc
449449
- .orig.tar.gz
450450
artifacts:
451-
- apache-arrow-archive-keyring_{no_rc_version}-1.debian.tar.xz
452-
- apache-arrow-archive-keyring_{no_rc_version}-1.dsc
453-
- apache-arrow-archive-keyring_{no_rc_version}-1_all.deb
454-
- apache-arrow-archive-keyring_{no_rc_version}.orig.tar.gz
451+
- apache-arrow-apt-source_{no_rc_version}-1.debian.tar.xz
452+
- apache-arrow-apt-source_{no_rc_version}-1.dsc
453+
- apache-arrow-apt-source_{no_rc_version}-1_all.deb
454+
- apache-arrow-apt-source_{no_rc_version}.orig.tar.gz
455455
- apache-arrow_{no_rc_version}-1.debian.tar.xz
456456
- apache-arrow_{no_rc_version}-1.dsc
457457
- apache-arrow_{no_rc_version}.orig.tar.gz
@@ -578,10 +578,10 @@ tasks:
578578
- .dsc
579579
- .orig.tar.gz
580580
artifacts:
581-
- apache-arrow-archive-keyring_{no_rc_version}-1.debian.tar.xz
582-
- apache-arrow-archive-keyring_{no_rc_version}-1.dsc
583-
- apache-arrow-archive-keyring_{no_rc_version}-1_all.deb
584-
- apache-arrow-archive-keyring_{no_rc_version}.orig.tar.gz
581+
- apache-arrow-apt-source_{no_rc_version}-1.debian.tar.xz
582+
- apache-arrow-apt-source_{no_rc_version}-1.dsc
583+
- apache-arrow-apt-source_{no_rc_version}-1_all.deb
584+
- apache-arrow-apt-source_{no_rc_version}.orig.tar.gz
585585
- apache-arrow_{no_rc_version}-1.debian.tar.xz
586586
- apache-arrow_{no_rc_version}-1.dsc
587587
- apache-arrow_{no_rc_version}.orig.tar.gz
@@ -710,10 +710,10 @@ tasks:
710710
- .dsc
711711
- .orig.tar.gz
712712
artifacts:
713-
- apache-arrow-archive-keyring_{no_rc_version}-1.debian.tar.xz
714-
- apache-arrow-archive-keyring_{no_rc_version}-1.dsc
715-
- apache-arrow-archive-keyring_{no_rc_version}-1_all.deb
716-
- apache-arrow-archive-keyring_{no_rc_version}.orig.tar.gz
713+
- apache-arrow-apt-source_{no_rc_version}-1.debian.tar.xz
714+
- apache-arrow-apt-source_{no_rc_version}-1.dsc
715+
- apache-arrow-apt-source_{no_rc_version}-1_all.deb
716+
- apache-arrow-apt-source_{no_rc_version}.orig.tar.gz
717717
- apache-arrow_{no_rc_version}-1.debian.tar.xz
718718
- apache-arrow_{no_rc_version}-1.dsc
719719
- apache-arrow_{no_rc_version}.orig.tar.gz
@@ -816,10 +816,10 @@ tasks:
816816
- .dsc
817817
- .orig.tar.gz
818818
artifacts:
819-
- apache-arrow-archive-keyring_{no_rc_version}-1.debian.tar.xz
820-
- apache-arrow-archive-keyring_{no_rc_version}-1.dsc
821-
- apache-arrow-archive-keyring_{no_rc_version}-1_all.deb
822-
- apache-arrow-archive-keyring_{no_rc_version}.orig.tar.gz
819+
- apache-arrow-apt-source_{no_rc_version}-1.debian.tar.xz
820+
- apache-arrow-apt-source_{no_rc_version}-1.dsc
821+
- apache-arrow-apt-source_{no_rc_version}-1_all.deb
822+
- apache-arrow-apt-source_{no_rc_version}.orig.tar.gz
823823
- apache-arrow_{no_rc_version}-1.debian.tar.xz
824824
- apache-arrow_{no_rc_version}-1.dsc
825825
- apache-arrow_{no_rc_version}.orig.tar.gz
@@ -922,10 +922,10 @@ tasks:
922922
- .dsc
923923
- .orig.tar.gz
924924
artifacts:
925-
- apache-arrow-archive-keyring_{no_rc_version}-1.debian.tar.xz
926-
- apache-arrow-archive-keyring_{no_rc_version}-1.dsc
927-
- apache-arrow-archive-keyring_{no_rc_version}-1_all.deb
928-
- apache-arrow-archive-keyring_{no_rc_version}.orig.tar.gz
925+
- apache-arrow-apt-source_{no_rc_version}-1.debian.tar.xz
926+
- apache-arrow-apt-source_{no_rc_version}-1.dsc
927+
- apache-arrow-apt-source_{no_rc_version}-1_all.deb
928+
- apache-arrow-apt-source_{no_rc_version}.orig.tar.gz
929929
- apache-arrow_{no_rc_version}-1.debian.tar.xz
930930
- apache-arrow_{no_rc_version}-1.dsc
931931
- apache-arrow_{no_rc_version}.orig.tar.gz

0 commit comments

Comments
 (0)