From 76ae62207bd083dfd43b7f755f2934458dd7d8bc Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 5 Nov 2021 04:26:42 -0400 Subject: [PATCH] Fix `librmm` uploads (#909) After merging #893, there are now 2 `librmm` `conda` packages being published instead of 1. Therefore the upload script needs to be updated accordingly. Skipping CI since the upload script isn't run on PRs anyway. Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Jordan Jacobelli (https://github.com/Ethyling) URL: https://github.com/rapidsai/rmm/pull/909 --- ci/cpu/upload.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ci/cpu/upload.sh b/ci/cpu/upload.sh index fc01b308b..a3a2d4620 100644 --- a/ci/cpu/upload.sh +++ b/ci/cpu/upload.sh @@ -29,8 +29,8 @@ fi gpuci_logger "Get conda file output locations" -export LIBRMM_FILE=`conda build conda/recipes/librmm --output` -export RMM_FILE=`conda build conda/recipes/rmm --python=$PYTHON --output` +export LIBRMM_FILES=$(conda build conda/recipes/librmm --output) +export RMM_FILE=$(conda build conda/recipes/rmm --python=$PYTHON --output) ################################################################################ # UPLOAD - Conda packages @@ -39,10 +39,12 @@ export RMM_FILE=`conda build conda/recipes/rmm --python=$PYTHON --output` gpuci_logger "Starting conda uploads" if [[ "$BUILD_LIBRMM" == "1" && "$UPLOAD_LIBRMM" == "1" ]]; then - test -e ${LIBRMM_FILE} - echo "Upload librmm" - echo ${LIBRMM_FILE} - gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing ${LIBRMM_FILE} --no-progress + while read -r LIBRMM_FILE; do + test -e ${LIBRMM_FILE} + echo "Upload librmm" + echo ${LIBRMM_FILE} + gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing ${LIBRMM_FILE} --no-progress + done <<< "${LIBRMM_FILES}" fi if [[ "$BUILD_RMM" == "1" && "$UPLOAD_RMM" == "1" ]]; then