Skip to content

Commit 7d4bc9b

Browse files
committed
ARROW-18103: [Packaging][deb][RPM] Fix upload artifacts patterns (#14462)
The current patterns may match multiple files that have the same base name. For example: * `arrow/dev/tasks/linux-packages/apache-arrow/apt/repositories/debian/pool/bookworm/main/a/apache-arrow/libarrow-glib-dev_10.0.0.dev480-1_arm64.deb` * `arrow/dev/tasks/linux-packages/apache-arrow/apt/build/debian-bookworm-arm64/libgandiva-glib-dev_10.0.0.dev480-1_arm64.deb` The latter (`**/build/**`) is an artifact in a build directory. We should use only the former (`**/repositories/**`) that is an artifact for upload. Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent 6278176 commit 7d4bc9b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

dev/tasks/linux-packages/github.linux.amd64.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
rake version:update
4545
rake docker:pull || :
4646
rake --trace {{ task_namespace }}:build BUILD_DIR=build
47-
sudo rm -rf */*/build
4847
popd
4948
env:
5049
APT_TARGETS: {{ target }}
@@ -103,5 +102,5 @@ jobs:
103102
ARROW_VERSION: {{ arrow.version }}
104103
YUM_TARGETS: {{ target }}
105104

106-
{% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/**/*{}") %}
105+
{% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/*/*/repositories/**/*{}") %}
107106
{{ macros.github_upload_releases(patterns)|indent }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,5 @@ script:
160160
- popd
161161

162162
after_success:
163-
{% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/**/*{}") %}
163+
{% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/*/*/repositories/**/*{}") %}
164164
{{ macros.travis_upload_releases(patterns) }}

0 commit comments

Comments
 (0)