From 9e48a87679cd9f6d9791e901222825ebe9732067 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Thu, 20 Oct 2022 08:51:16 +0900 Subject: [PATCH] ARROW-18103: [Packaging][deb][RPM] Fix upload artifacts patterns 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. --- dev/tasks/linux-packages/github.linux.amd64.yml | 3 +-- dev/tasks/linux-packages/travis.linux.arm64.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dev/tasks/linux-packages/github.linux.amd64.yml b/dev/tasks/linux-packages/github.linux.amd64.yml index f252a081d67aa..d6488d5e7140b 100644 --- a/dev/tasks/linux-packages/github.linux.amd64.yml +++ b/dev/tasks/linux-packages/github.linux.amd64.yml @@ -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 }} @@ -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 }} diff --git a/dev/tasks/linux-packages/travis.linux.arm64.yml b/dev/tasks/linux-packages/travis.linux.arm64.yml index bc2311a33d6c7..f3ec4f1de2beb 100644 --- a/dev/tasks/linux-packages/travis.linux.arm64.yml +++ b/dev/tasks/linux-packages/travis.linux.arm64.yml @@ -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) }}