Skip to content

Commit

Permalink
ARROW-18103: [Packaging][deb][RPM] Fix upload artifacts patterns (apa…
Browse files Browse the repository at this point in the history
…che#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>
  • Loading branch information
kou authored and zeroshade committed Oct 20, 2022
1 parent 844ced1 commit b177b39
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions dev/tasks/linux-packages/github.linux.amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
rake version:update
rake docker:pull || :
rake --trace {{ task_namespace }}:build BUILD_DIR=build
sudo rm -rf */*/build
popd
env:
APT_TARGETS: {{ target }}
Expand Down Expand Up @@ -103,5 +102,5 @@ jobs:
ARROW_VERSION: {{ arrow.version }}
YUM_TARGETS: {{ target }}

{% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/**/*{}") %}
{% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/*/*/repositories/**/*{}") %}
{{ macros.github_upload_releases(patterns)|indent }}
2 changes: 1 addition & 1 deletion dev/tasks/linux-packages/travis.linux.arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,5 +160,5 @@ script:
- popd

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

0 comments on commit b177b39

Please sign in to comment.